Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev

2 files changed, 25 insertions, 16 deletions

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 7bd44da36c..4b591b02fa 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -9,46 +9,54 @@ KERNEL=="ram*|loop*|fd*|nbd*",		GOTO="no_volume_id"
 
 # skip removable ide devices, because open(2) on them causes an events loop
 BUS=="ide", SYSFS{removable}=="1", DRIVER!="ide-cdrom",	GOTO="no_volume_id"
-BUS=="ide", SYSFS{../removable}=="1",			GOTO="no_volume_id"
 
-# disk id
+# look for different kinds of unique identificators
 KERNEL=="hd*[!0-9]", \
 	IMPORT{program}="/sbin/ata_id --export $tempnode"
 
 KERNEL=="sd*[!0-9]|sr*",		SYSFS{ieee1394_id}=="?*", \
-	IMPORT{program}="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394'"
+	ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$sysfs{ieee1394_id}"
 KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", \
 	IMPORT{program}="/sbin/usb_id -x"
 KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", \
-	IMPORT{program}="/sbin/scsi_id -g -x -s %p -d %N"
+	IMPORT{program}="/sbin/scsi_id -g -x -s $devpath -d $tempnode"
 KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", \
-	IMPORT{program}="/sbin/scsi_id -g -x -a -s %p -d %N"
+	IMPORT{program}="/sbin/scsi_id -g -x -a -s $devpath -d $tempnode"
 
 KERNEL=="dasd*[!0-9]", \
 	IMPORT{program}="/sbin/dasd_id --export $tempnode"
 
-KERNEL=="hd*[0-9]|sd*[0-9]|dasd*[0-9]", IMPORT{parent}="ID_*"
+KERNEL=="*[!0-9]", SYSFS{removable}!="1", \
+	IMPORT{program}="/sbin/edd_id --export $tempnode"
+
+# find the physical path of the device
+KERNEL=="*[!0-9]|sr*",			ENV{ID_TYPE}=="?*", \
+	IMPORT{program}="/sbin/path_id $devpath"
+
+# import the variables of partitions from the parent disks
+KERNEL=="*[0-9]",			IMPORT{parent}="ID_*"
+
 KERNEL=="hd*[!0-9]",			ENV{ID_SERIAL}=="?*", \
 	SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
-KERNEL=="sd*[!0-9]|sr*|dasd[!0-9]*",	ENV{ID_SERIAL}=="?*", \
-	SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 KERNEL=="hd*[0-9]",			ENV{ID_SERIAL}=="?*", \
 	SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+KERNEL=="sd*[!0-9]|dasd[!0-9]*|sr*",	ENV{ID_SERIAL}=="?*", \
+	SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 KERNEL=="sd*[0-9]|dasd*[0-9]",		ENV{ID_SERIAL}=="?*", \
 	SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+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"
 
-# path
-KERNEL=="*[!0-9]|sr*",			ENV{ID_TYPE}=="?*", \
-	IMPORT{program}="/sbin/path_id %p"
-
-KERNEL=="*[0-9]",			IMPORT{parent}="ID_*"
 KERNEL=="*[!0-9]|sr*",			ENV{ID_PATH}=="?*", \
 	SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="sr*",				GOTO="no_volume_id"
 KERNEL=="*[0-9]",			ENV{ID_PATH}=="?*", \
 	SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
 
 # UUID and volume label
-KERNEL=="*[!0-9]|sr*", SYSFS{removable}=="1", GOTO="no_volume_id"
+KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="no_volume_id"
 IMPORT{program}="/sbin/vol_id --export $tempnode"
 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}"
diff --git a/etc/udev/persistent.rules b/etc/udev/persistent.rules
index 0ca0c56545..0b231aacd5 100644
--- a/etc/udev/persistent.rules
+++ b/etc/udev/persistent.rules
@@ -8,7 +8,7 @@ SUBSYSTEM!="block", GOTO="persistent_end"
 KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
 
 # never access removable ide devices, the drivers are causing event loops on open()
-SUBSYSTEM=="block", BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
+BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
 
 # by-id (hardware serial number)
 KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
@@ -40,7 +40,8 @@ ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 # BIOS Enhanced Disk Device
 KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
-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}"
+KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
 
 LABEL="persistent_end"