- updated

Changed files:
    udev.rules -> 1.5

diff --git a/udev.rules b/udev.rules
index 8a0294c8a34c37a0300af679a606911bdda4ee44..e0a5bc81efd5d68c52629e5a17879ecf8db52cb8 100644 (file)
--- a/udev.rules
+++ b/udev.rules
@@ -9,7 +9,7 @@
 #KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*",        NAME="dri/card%n"
+KERNEL="card*",                NAME="dri/card%n"
 
 # alsa devices
 KERNEL="controlC[0-9]*", NAME="snd/%k"
@@ -28,31 +28,44 @@ KERNEL="ts*",               NAME="input/%k"
 
 BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
 
-KERNEL="microcode",     NAME="%k", SYMLINK="cpu/0/%k"
-KERNEL="ram1",                 NAME="%k", SYMLINK="ram"
-KERNEL="video0",       NAME="%k", SYMLINK="video"
-KERNEL="radio0",       NAME="%k", SYMLINK="radio"
-KERNEL="audio0",       NAME="%k", SYMLINK="audio"
-KERNEL="dsp0",         NAME="%k", SYMLINK="dsp"
-KERNEL="fb0",          NAME="%k", SYMLINK="fb"
-KERNEL="qft0",         NAME="%k", SYMLINK="ftape"
-KERNEL="isdnctrl0",    NAME="%k", SYMLINK="isdnctrl"
-KERNEL="mixer0",       NAME="%k", SYMLINK="mixer"
-KERNEL="ram0",         NAME="%k", SYMLINK="ramdisk"
-KERNEL="sbpcd0",       NAME="%k", SYMLINK="sbpcd"
-KERNEL="radio0",       NAME="%k", SYMLINK="radio"
-KERNEL="tty0",         NAME="%k", SYMLINK="systty"
-KERNEL="vbi0",         NAME="%k", SYMLINK="vbi"
-KERNEL="null",         NAME="%k", SYMLINK="XOR"
-
-KERNEL="tun",          NAME="net/%k"
-
-KERNEL="device-mapper", NAME="mapper/control"
+KERNEL="microcode",     SYMLINK="cpu/0/%k"
+KERNEL="ram1",                 SYMLINK="ram"
+KERNEL="video0",       SYMLINK="video"
+KERNEL="radio0",       SYMLINK="radio"
+KERNEL="audio0",       SYMLINK="audio"
+KERNEL="dsp0",         SYMLINK="dsp"
+KERNEL="fb0",          SYMLINK="fb"
+KERNEL="qft0",         SYMLINK="ftape"
+KERNEL="isdnctrl0",    SYMLINK="isdnctrl"
+KERNEL="mixer0",       SYMLINK="mixer"
+KERNEL="ram0",         SYMLINK="ramdisk"
+KERNEL="sbpcd0",       SYMLINK="sbpcd"
+KERNEL="radio0",       SYMLINK="radio"
+KERNEL="tty0",         SYMLINK="systty"
+KERNEL="vbi0",         SYMLINK="vbi"
+KERNEL="null",         SYMLINK="XOR"
+
+KERNEL="tun",          NAME="net/%k"
+
+KERNEL="device-mapper",        NAME="mapper/control"
 
 # old compat symlinks with enumeration
-KERNEL="sr*", NAME="scd%n", SYMLINK="cdrom%e"
-KERNEL="scd*", NAME="%k", SYMLINK="cdrom%e"
-KERNEL="pcd*", NAME="%k", SYMLINK="cdrom%e"
-KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom%e"
-KERNEL="fd[0-9]", NAME="%k", SYMLINK="floppy%e"
-KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy", NAME="%k", SYMLINK="floppy%e
+KERNEL="sr*",                  SYMLINK="cdrom%e"
+KERNEL="scd*",                 SYMLINK="cdrom%e"
+KERNEL="pcd*",                 SYMLINK="cdrom%e"
+KERNEL="fd[0-9]",      SYMLINK="floppy%e"
+
+KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", SYMLINK="cdrom%e"
+
+KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy", SYMLINK="floppy%e
+
+KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
+KERNEL="sr*", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK="dvd%e"
+KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
+KERNEL="sr*", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK="cdwriter%e"
+KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
+KERNEL="sr*", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK="dvdwriter%e"
+
+# rename sr* to scd*
+KERNEL="sr*", NAME="scd%n"
+