[PATCH] udev - fix cdrom symlink rule

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

diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index e72751656e3d6e9b192502fa7f4c2a2b16435255..344304dd951397e67deeb13cb3e04ece3bd61c50 100644 (file)
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -1,20 +1,8 @@
-# There are a number of modifiers that are allowed to be used in the NAME or PROGRAM fields.
-# They provide the following subsitutions:
-# %n - the "kernel number" of the device.
-#      for example, 'sda3' has a "kernel number" of '3'
-# %k - the kernel name for the device.
-# %M - the kernel major number for the device
-# %m - the kernel minor number for the device
-# %b - the bus id for the device
-# %c - the return value for the CALLOUT program (note, this doesn't work within
-#      the PROGRAM field for the obvious reason.)
-# %D - use the devfs style disk name for this device.
-#      For partitions, this will result in 'part%n'
-#      If this is not a partition, it will result in 'disc'
-#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
 
 # Looking for scsi bus id 42:0:0:1
-BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-42:0:0:1", NAME="%c"
+BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
 
 # A usb camera.
 BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
@@ -47,7 +35,7 @@ KERNEL="ttyUSB0", NAME="pl2303"
 #KERNEL="tty*", NAME="vc/%n"
 
 # if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", PROGRAM="/bin/cat /proc/ide/%k/media", ID="cdrom", NAME="%k", SYMLINK="cdrom" 
+BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
 
 # device mapper creates its own device nodes so ignore these
 KERNEL="dm-[0-9]*", NAME=""
@@ -55,3 +43,18 @@ KERNEL="dm-[0-9]*", NAME=""
 # DRI devices always go into a subdirectory (as per the LSB spec)
 KERNEL="card*", NAME="dri/card%n"
 
+# alsa devices
+KERNEL="controlC[0-9]*", NAME="snd/%k"
+KERNEL="hw[CD0-9]*",     NAME="snd/%k"
+KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
+KERNEL="midi[CD0-9]*",   NAME="snd/%k"
+KERNEL="timer",          NAME="snd/%k"
+KERNEL="seq",            NAME="snd/%k"
+
+# input devices
+KERNEL="mice",         NAME="input/%k"
+KERNEL="mouse*",       NAME="input/%k"
+KERNEL="event*",       NAME="input/%k"
+KERNEL="js*",          NAME="input/%k"
+KERNEL="ts*",          NAME="input/%k"
+