update Debian rules

[elogind.git] / etc / udev / debian / persistent.rules

diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 4b591b02fa591bcf7ae91fbc9173f37cbd7b54a7..349817d797543ef1239e94bf4fe5de458bc24ba8 100644 (file)
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -5,33 +5,35 @@ 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
-BUS=="ide", SYSFS{removable}=="1", DRIVER!="ide-cdrom",        GOTO="no_volume_id"
+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}="/sbin/ata_id --export $tempnode"
+       IMPORT{program}="ata_id --export $tempnode"
 
-KERNEL=="sd*[!0-9]|sr*",               SYSFS{ieee1394_id}=="?*", \
+KERNEL=="sd*[!0-9]|sr*|st*",           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*",           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}="/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"
 
 # import the variables of partitions from the parent disks
 KERNEL=="*[0-9]",                      IMPORT{parent}="ID_*"
@@ -44,6 +46,8 @@ 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}=="?*", \
@@ -51,15 +55,19 @@ KERNEL=="*[0-9]",                   ENV{ID_EDD}=="?*", \
 
 KERNEL=="*[!0-9]|sr*",                 ENV{ID_PATH}=="?*", \
        SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="sr*",                         GOTO="no_volume_id"
+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}="/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}"
+IMPORT{program}="vol_id --export $tempnode"
+ENV{ID_FS_UUID}=="?*",                 ENV{ID_FS_USAGE}=="filesystem|other", \
+       SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_LABEL_SAFE}=="?*",           ENV{ID_FS_USAGE}=="filesystem|other", \
+       SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 # end of processing
 LABEL="no_volume_id"