X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fdebian%2Fpersistent.rules;h=349817d797543ef1239e94bf4fe5de458bc24ba8;hp=b444a27bf60f7936269ea8cd5eaaa1ddcb238bf0;hb=47b3e9478c48dbe5f428bd6fc074eac78f2765c3;hpb=b7299fd904d33bc2d6845be535666b528fd18948

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index b444a27bf..349817d79 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -1,49 +1,74 @@
 # This file contains the rules needed to create persistent device names.
 
 # we are only interested in add actions for block devices
-ACTION!="add",		GOTO="no_volume_id"
-SUBSYSTEM!="block",	GOTO="no_volume_id"
+SUBSYSTEM!="block",			GOTO="no_volume_id"
+ACTION!="add",				GOTO="no_volume_id"
 
 # and we can safely ignore these kinds of devices
-KERNEL=="ram*|loop*|fd*|sr*", GOTO="no_volume_id"
-
-# disk id
-KERNEL=="hd*[!0-9]",	IMPORT="/sbin/ata_id --export $tempnode"
-KERNEL=="hd*[!0-9]",	ENV{ID_SERIAL}=="?*", \
-	SYMLINK+="$env{ID_TYPE}/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
-
-KERNEL=="hd*[0-9]",	IMPORT{parent}="ID_*"
-KERNEL=="hd*[0-9]",	ENV{ID_SERIAL}=="?*", \
-	SYMLINK+="$env{ID_TYPE}/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
-
-KERNEL=="sd*[!0-9]",	SYSFS{ieee1394_id}=="*", \
-	IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394\nID_TYPE=disk'"
-KERNEL=="sd*[!0-9]",	ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x"
-KERNEL=="sd*[!0-9]",	ENV{ID_SERIAL}=="", \
-	IMPORT="/sbin/scsi_id -g -x -a -s %p"
-KERNEL=="sd*[!0-9]",	ENV{ID_SERIAL}=="?*", \
-	SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-
-KERNEL=="sd*[0-9]",	IMPORT{parent}="ID_*"
-KERNEL=="sd*[0-9]",	ENV{ID_SERIAL}=="?*", \
-	SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
-
-# path
-KERNEL=="*[!0-9]",	ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", \
-	SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PATH}"
-
-KERNEL=="*[0-9]",	IMPORT{parent}="ID_*"
-KERNEL=="*[0-9]",	ENV{ID_PATH}=="?*", \
-	SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PATH}-part%n"
-
-# volume label and uuid
-KERNEL=="*[!0-9]",	SYSFS{removable}=="1", GOTO="no_volume_id"
-KERNEL=="*[0-9]",	IMPORT="/sbin/vol_id --export $tempnode"
-KERNEL=="*[0-9]",	ENV{ID_FS_UUID}=="?*", \
+KERNEL=="ram*|loop*|fd*|nbd*|dm-*",	GOTO="no_volume_id"
+
+# skip removable ide devices, because open(2) on them causes an events loop
+KERNEL=="hd*[!0-9]",   SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", \
+	GOTO="no_volume_id"
+KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", \
+	GOTO="no_volume_id"
+
+# look for different kinds of unique identificators
+KERNEL=="hd*[!0-9]", \
+	IMPORT{program}="ata_id --export $tempnode"
+
+KERNEL=="sd*[!0-9]|sr*|st*",		SYSFS{ieee1394_id}=="?*", \
+	ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$sysfs{ieee1394_id}"
+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 $devpath -d $tempnode"
+KERNEL=="sd*[!0-9]|sr*|st*",		ENV{ID_SERIAL}=="", \
+	IMPORT{program}="scsi_id -g -x -a -s $devpath -d $tempnode"
+
+KERNEL=="dasd*[!0-9]", \
+	IMPORT{program}="dasd_id --export $tempnode"
+
+KERNEL=="*[!0-9]", \
+	IMPORT{program}="edd_id --export $tempnode"
+
+# find the physical path of the device
+KERNEL=="*[!0-9]|sr*|st*",		IMPORT{program}="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=="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=="st*",				ENV{ID_SERIAL}=="?*", \
+	SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+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=="*[!0-9]|sr*",			ENV{ID_PATH}=="?*", \
+	SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="st*",				ENV{ID_PATH}=="?*", \
+	SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="sr*|st*",			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]", SYSFS{removable}=="1", GOTO="no_volume_id"
+IMPORT{program}="vol_id --export $tempnode"
+ENV{ID_FS_UUID}=="?*",			ENV{ID_FS_USAGE}=="filesystem|other", \
 	SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-KERNEL=="*[0-9]",	ENV{ID_FS_LABEL_SAFE}=="?*", \
+ENV{ID_FS_LABEL_SAFE}=="?*",		ENV{ID_FS_USAGE}=="filesystem|other", \
 	SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 # end of processing
-SUBSYSTEM=="block", LABEL="no_volume_id"
+LABEL="no_volume_id"