X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fdebian%2Fpersistent.rules;h=de2fa2a928452adb02e96749f605b14e52039fad;hp=4b591b02fa591bcf7ae91fbc9173f37cbd7b54a7;hb=98d8d24bcc668022857e1b4852ac37ce4400ddf8;hpb=9bd72b9b6b2645ea3c36ef0be9a070e8ff67904f

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 4b591b02f..de2fa2a92 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -1,37 +1,53 @@
 # This file contains the rules needed to create persistent device names.
 
 # we are only interested in add actions for block devices
-SUBSYSTEM!="block",			GOTO="no_volume_id"
-ACTION!="add",				GOTO="no_volume_id"
+ACTION!="add",				GOTO="persistent_storage_end"
+SUBSYSTEM!="block",			GOTO="persistent_storage_end"
 
 # and we can safely ignore these kinds of devices
-KERNEL=="ram*|loop*|fd*|nbd*",		GOTO="no_volume_id"
+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
 
 # 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"
+KERNEL=="hd*[!0-9]",   ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", \
+	GOTO="persistent_storage_end"
+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", \
+	GOTO="persistent_storage_end"
+
+# ignore partitions that span the entire disk
+ATTR{whole_disk}=="*",			GOTO="persistent_storage_end"
+
+# skip xen virtual hard disks
+DRIVERS=="vbd",				GOTO="no_hardware_id"
 
 # look for different kinds of unique identificators
 KERNEL=="hd*[!0-9]", \
-	IMPORT{program}="/sbin/ata_id --export $tempnode"
+	IMPORT{program}="ata_id --export $tempnode"
 
-KERNEL=="sd*[!0-9]|sr*",		SYSFS{ieee1394_id}=="?*", \
-	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 $devpath -d $tempnode"
-KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", \
-	IMPORT{program}="/sbin/scsi_id -g -x -a -s $devpath -d $tempnode"
+KERNEL=="sd*[!0-9]|sr*|st*|nst*",	ATTRS{ieee1394_id}=="?*", \
+	ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$attr{ieee1394_id}"
+KERNEL=="sd*[!0-9]|sr*|st*|nst*",	ENV{ID_SERIAL}=="", \
+	IMPORT{program}="usb_id -x"
+KERNEL=="sd*[!0-9]|sr*|st*|nst*",	ENV{ID_SERIAL}=="", \
+	IMPORT{program}="scsi_id -g -x -s $devpath -d $tempnode"
+KERNEL=="sd*[!0-9]|sr*|st*|nst*",	ENV{ID_SERIAL}=="", \
+	IMPORT{program}="scsi_id -g -x -a -s $devpath -d $tempnode"
+KERNEL=="cciss?c[0-9]d[0-9]",		ENV{ID_SERIAL}=="",
+	IMPORT{program}="scsi_id -g -x -n -s $devpath -d $tempnode"
+KERNEL=="sg*", ATTRS{type}=="8",	ENV{ID_SERIAL}=="", \
+	IMPORT{program}="scsi_id -g -x -s $devpath -d $tempnode"
+KERNEL=="sg*", ATTRS{type}=="8",	ENV{ID_SERIAL}=="", \
+	IMPORT{program}="scsi_id -g -x -a -s $devpath -d $tempnode"
 
 KERNEL=="dasd*[!0-9]", \
-	IMPORT{program}="/sbin/dasd_id --export $tempnode"
+	IMPORT{program}="dasd_id --export $tempnode"
 
-KERNEL=="*[!0-9]", SYSFS{removable}!="1", \
-	IMPORT{program}="/sbin/edd_id --export $tempnode"
+KERNEL=="*[!0-9]", \
+	IMPORT{program}="edd_id --export $tempnode"
 
 # find the physical path of the device
-KERNEL=="*[!0-9]|sr*",			ENV{ID_TYPE}=="?*", \
-	IMPORT{program}="/sbin/path_id $devpath"
+KERNEL=="*[!0-9]|sr*|st*",		IMPORT{program}="path_id $devpath"
+
+LABEL="no_hardware_id"
 
 # import the variables of partitions from the parent disks
 KERNEL=="*[0-9]",			IMPORT{parent}="ID_*"
@@ -40,27 +56,52 @@ 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=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL_SHORT}=="?*", \
+	ENV{ID_VENDOR}=="ATA", \
+	SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL_SHORT}"
+KERNEL=="sd*[0-9]|cciss*p[0-9]",	ENV{ID_SERIAL_SHORT}=="?*", \
+	ENV{ID_VENDOR}=="ATA", \
+	SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL_SHORT}-part%n"
+
+KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", \
+	ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", \
+	SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}"
+KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", \
+	ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", \
+	SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$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"
 
-KERNEL=="*[!0-9]|sr*",			ENV{ID_PATH}=="?*", \
+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=="nst*",				ENV{ID_SERIAL}=="?*", \
+	SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
+KERNEL=="sg*", ATTRS{type}=="8",	ENV{ID_SERIAL}=="?*", \
+	SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+
+KERNEL=="*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_PATH}=="?*", \
 	SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="sr*",				GOTO="no_volume_id"
-KERNEL=="*[0-9]",			ENV{ID_PATH}=="?*", \
+KERNEL=="*[0-9]|cciss*p[0-9]",		ENV{ID_PATH}=="?*", \
 	SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+KERNEL=="st*",				ENV{ID_PATH}=="?*", \
+	SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="sr*|st*",			GOTO="persistent_storage_end"
 
 # UUID and volume label
-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}"
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
+IMPORT{program}="vol_id --export $tempnode"
+ENV{ID_FS_UUID_ENC}=="?*",	ENV{ID_FS_USAGE}=="filesystem|other|crypto", \
+	SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_LABEL_ENC}=="?*",	ENV{ID_FS_USAGE}=="filesystem|other", \
+	SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
 
 # end of processing
-LABEL="no_volume_id"
+LABEL="persistent_storage_end"