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=277d03dea80d66b761054d3a4cc12234b50345ab;hp=9f1887ddea1f18b4e1a299d38eb3bd0f6efa5458;hb=a1e6bd93d3d650c2064daafdb253120ae6e89398;hpb=5263fb3464fdb43b1ca0eb6e7b71eb4ff91c6a17

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 9f1887dde..277d03dea 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -5,20 +5,23 @@ 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*|nbd*",		GOTO="no_volume_id"
+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", \
+KERNEL=="hd*[!0-9]",   ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", \
 	GOTO="no_volume_id"
-KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", \
+KERNEL=="hd*[0-9]", ATTR{../removable}=="1", \
 	GOTO="no_volume_id"
 
+# skip xen virtual hard disks
+DRIVERS=="vbd",				GOTO="no_hardware_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*",		ATTRS{ieee1394_id}=="?*", \
+	ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$attr{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}=="", \
@@ -35,6 +38,8 @@ KERNEL=="*[!0-9]", \
 # find the physical path of the device
 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_*"
 
@@ -62,16 +67,13 @@ 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"
+KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="no_volume_id"
 IMPORT{program}="vol_id --export $tempnode"
-ENV{ID_FS_UUID}=="?*",			ENV{ID_FS_USAGE}=="filesystem|other", \
+ENV{ID_FS_UUID}=="?*",		ENV{ID_FS_USAGE}=="filesystem|other|crypto", \
 	SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-ENV{ID_FS_LABEL_SAFE}=="?*",		ENV{ID_FS_USAGE}=="filesystem|other", \
+ENV{ID_FS_LABEL_SAFE}=="?*",	ENV{ID_FS_USAGE}=="filesystem|other", \
 	SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
-#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", \
-#	SYMLINK+="disk/by-name/%c"
-
 # end of processing
 LABEL="no_volume_id"