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=7fc86246f3dd604e83b8ec62b2e3ab71f66efafc;hb=47b3e9478c48dbe5f428bd6fc074eac78f2765c3;hpb=7f1ba7b03f388c1d3d03b0f66a1c0ced7707ac11

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 7fc86246f..349817d79 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -5,7 +5,7 @@ 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", \
@@ -33,8 +33,7 @@ KERNEL=="*[!0-9]", \
 	IMPORT{program}="edd_id --export $tempnode"
 
 # find the physical path of the device
-KERNEL=="*[!0-9]|sr*|st*",		ENV{ID_TYPE}=="?*", \
-	IMPORT{program}="path_id $devpath"
+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_*"
@@ -70,9 +69,6 @@ ENV{ID_FS_UUID}=="?*",			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"