X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.rules;h=06d5842c2a5fbf8eade17305a5a7250636abfbf8;hp=3044a87b44bd83b68273f82d84eb93ca0bf43b1b;hb=18c783a7e6acab9590980a54978a129f7b3dca81;hpb=83be97ba211c4f69e7fd9f16f57ca7210a116a7d

diff --git a/udev.rules b/udev.rules
index 3044a87b4..06d5842c2 100644
--- a/udev.rules
+++ b/udev.rules
@@ -2,6 +2,7 @@
 # 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
@@ -9,33 +10,33 @@
 #      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 'disk'
+#      If this is not a partition, it will result in 'disc'
 #
 
 # Looking for scsi bus id 42:0:0:1
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-42:0:0:1", NAME="%c"
 
 # A usb camera.
-LABEL, BUS="usb", vendor="FUJIFILM", NAME="camera%n"
+LABEL, BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
 
 # USB Epson printer to be called lp_epson
-LABEL, BUS="usb", serial="HXOLL0012202323480", NAME="lp_epson"
+LABEL, BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
 
 # USB HP printer to be called lp_hp
-LABEL, BUS="usb", serial="W09090207101241330", NAME="lp_hp"
+LABEL, BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
 
 # sound card with PCI bus id 00:0b.0 to be the first sound card
-NUMBER, BUS="pci", id="00:0b.0", NAME="dsp"
+NUMBER, BUS="pci", ID="00:0b.0", NAME="dsp"
 
 # sound card with PCI bus id 00:07.1 to be the second sound card
-NUMBER, BUS="pci", id="00:07.1", NAME="dsp1" 
+NUMBER, BUS="pci", ID="00:07.1", NAME="dsp1" 
 
 # USB mouse plugged into the third port of the first hub to be called mouse0
-TOPOLOGY, BUS="usb", place="1.3", NAME="mouse0"
+TOPOLOGY, BUS="usb", PLACE="1.3", NAME="mouse0"
 
 # USB tablet plugged into the third port of the second hub to be called mouse1
-TOPOLOGY, BUS="usb", place="2.3", NAME="mouse1"
-TOPOLOGY, BUS="usb", place="2.4", NAME="mouse2"
+TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
+TOPOLOGY, BUS="usb", PLACE="2.4", NAME="mouse2"
 
 # ttyUSB1 should always be called visor
 REPLACE, KERNEL="ttyUSB1", NAME="visor"