chiark / gitweb /
update Debian rules
[elogind.git] / etc / udev / debian / persistent.rules
index a6467fa..7bd44da 100644 (file)
@@ -8,14 +8,14 @@ ACTION!="add",                                GOTO="no_volume_id"
 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",     GOTO="no_volume_id"
-BUS=="ide", SYSFS{../removable}=="1",  GOTO="no_volume_id"
+BUS=="ide", SYSFS{removable}=="1", DRIVER!="ide-cdrom",        GOTO="no_volume_id"
+BUS=="ide", SYSFS{../removable}=="1",                  GOTO="no_volume_id"
 
 # disk id
 KERNEL=="hd*[!0-9]", \
        IMPORT{program}="/sbin/ata_id --export $tempnode"
 
-KERNEL=="sd*[!0-9]|sr*",               SYSFS{ieee1394_id}=="*", \
+KERNEL=="sd*[!0-9]|sr*",               SYSFS{ieee1394_id}=="?*", \
        IMPORT{program}="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394'"
 KERNEL=="sd*[!0-9]|sr*",               ENV{ID_SERIAL}=="", \
        IMPORT{program}="/sbin/usb_id -x"
@@ -39,7 +39,7 @@ KERNEL=="sd*[0-9]|dasd*[0-9]",                ENV{ID_SERIAL}=="?*", \
 
 # path
 KERNEL=="*[!0-9]|sr*",                 ENV{ID_TYPE}=="?*", \
-       IMPORT{program}="/sbin/path_id %p",
+       IMPORT{program}="/sbin/path_id %p"
 
 KERNEL=="*[0-9]",                      IMPORT{parent}="ID_*"
 KERNEL=="*[!0-9]|sr*",                 ENV{ID_PATH}=="?*", \