|
|
diff -dur udev-103/etc/udev/rules.d/05-udev-early.rules udev-103-p/etc/udev/rules.d/05-udev-early.rules
--- udev-103/etc/udev/rules.d/05-udev-early.rules 2006-10-20 14:43:35.000000000 +0200
+++ udev-103-p/etc/udev/rules.d/05-udev-early.rules 2006-11-24 20:23:27.000000000 +0100
@@ -1,3 +1,8 @@
+# ignore these until someone needs them
+SUBSYSTEM=="drivers", OPTIONS="ignore_device"
+# SUBSYSTEM=="module", OPTIONS="ignore_device"
+
# sysfs is populated after the event is sent+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"-
+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
diff -dur udev-103/etc/udev/rules.d/60-persistent-storage.rules udev-103-p/etc/udev/rules.d/60-persistent-storage.rules
--- udev-103/etc/udev/rules.d/60-persistent-storage.rules 2006-10-20 14:43:35.000000000 +0200
+++ udev-103-p/etc/udev/rules.d/60-persistent-storage.rules 2006-11-24 20:30:38.000000000 +0100
@@ -5,11 +5,11 @@
SUBSYSTEM!="block", GOTO="persistent_storage_end" # skip rules for inappropriate block devices-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*", GOTO="persistent_storage_end"
+KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_storage_end"
-# never access non-cdrom removable ide devices, the drivers are causing event loops on open()
-KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
-KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
+# never access removable ide devices, the drivers are causing event loops on open()
+KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS!="ide-cdrom", GOTO="persistent_storage_end"
+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", DRIVERS!="ide-cdrom", GOTO="persistent_storage_end"
# for partitions import parent information KERNEL=="*[0-9]", IMPORT{parent}="ID_*"@@ -19,7 +19,7 @@
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" -KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"@@ -29,20 +29,22 @@
KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}" # by-path (shortest physical path)-KERNEL=="*[!0-9]|sr*", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="st*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="st*", ENV{ID_TYPE}=="?*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
KERNEL=="sr*|st*", GOTO="persistent_storage_end" KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" # by-label/by-uuid (filesystem properties) KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end" IMPORT{program}="vol_id --export $tempnode"-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
# BIOS Enhanced Disk Device KERNEL=="*[!0-9]", IMPORT{program}="edd_id --export $tempnode" KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}" KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n" +KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", SYMLINK="disk/by-name/%c"
+
LABEL="persistent_storage_end"Nur in udev-103-p/etc/udev/rules.d: 60-persistent-storage.rules~.
|
