X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fudev.rules;h=e1c2cbe91efd5c9f0973cc40c25e9321967a99b9;hp=98d2ceccc785b6a224a5b53637f2be553f6e42fc;hb=16378373cb9d96e5d424921806ff71f218e92694;hpb=18f0045bc86f6b8b50a91fc4e8af4cfdd2379751

diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index 98d2ceccc..e1c2cbe91 100644
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -5,13 +5,13 @@
 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"
+BUS="usb", SYSFS{vendor}="FUJIFILM", SYSFS{model}="M100", NAME="camera%n"
 
 # USB Epson printer to be called lp_epson
 BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
 
 # USB HP printer to be called lp_hp
-BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
+BUS="usb", SYSFS{serial}="W09090207101241330", NAME="lp_hp"
 
 # sound card with PCI bus id 00:0b.0 to be the first sound card
 BUS="pci", ID="00:0b.0", NAME="dsp"
@@ -35,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", RESULT="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=""