[PATCH] some cleanups due to the need for LABEL rules to use "SYSFS_" now.

diff --git a/udev.8 b/udev.8
index 08f12908b5aed75f8d83bcf64b854f74dc38ff85..f26beb4b9d1029e13c8f8238caa1ada5047d3dee 100644 (file)
--- a/udev.8
+++ b/udev.8
@@ -178,7 +178,7 @@ TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
 REPLACE, KERNEL="ttyUSB1", NAME="pda", SYMLINK="palmtop handheld"
 
 # multiple USB webcams with symlinks to be called webcam0, webcam1, ...
-LABEL, BUS="usb", model="WebCam V3", NAME="video%n", SYMLINK="webcam%n"
+LABEL, BUS="usb", SYSFS_model="WebCam V3", NAME="video%n", SYMLINK="webcam%n"
 .fi
 .P
 Permissions and ownership for the created device files may specified at

diff --git a/udev.rules b/udev.rules
index e497aed05b4d411ec167a335c452bb96c2e974cc..618737ffd8d86affcfe5df93d03f0bc1b213ed84 100644 (file)
--- a/udev.rules
+++ b/udev.rules
@@ -16,26 +16,26 @@
 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", 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"