[PATCH] convert the default rules files to the new format.

3 files changed, 63 insertions, 63 deletions

diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index 68c0c63c8..e72751656 100644
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -14,44 +14,44 @@
 #
 
 # 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"
+BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-42:0:0:1", NAME="%c"
 
 # A usb camera.
-LABEL, 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
-LABEL, BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
+BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
 
 # USB HP printer to be called lp_hp
-LABEL, 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
-NUMBER, BUS="pci", ID="00:0b.0", NAME="dsp"
+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" 
+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"
+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"
+BUS="usb", PLACE="2.3", NAME="mouse1"
+BUS="usb", PLACE="2.4", NAME="mouse2"
 
 # ttyUSB1 should always be called visor
-REPLACE, KERNEL="ttyUSB1", NAME="visor"
-REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
+KERNEL="ttyUSB1", NAME="visor"
+KERNEL="ttyUSB0", NAME="pl2303"
 
 # a devfs like way to name some tty devices
-#REPLACE, KERNEL="ttyS*", NAME="tts/%n"
-#REPLACE, KERNEL="tty*", NAME="vc/%n"
+#KERNEL="ttyS*", NAME="tts/%n"
+#KERNEL="tty*", NAME="vc/%n"
 
 # if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-CALLOUT, BUS="ide", PROGRAM="/bin/cat /proc/ide/%k/media", ID="cdrom", NAME="%k", SYMLINK="cdrom" 
+BUS="ide", PROGRAM="/bin/cat /proc/ide/%k/media", ID="cdrom", NAME="%k", SYMLINK="cdrom" 
 
-# device mapper creates its own device nodes
-IGNORE, KERNEL="dm-[0-9]*"
+# device mapper creates its own device nodes so ignore these
+KERNEL="dm-[0-9]*", NAME=""
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
-REPLACE, KERNEL="card*", NAME="dri/card%n"
+KERNEL="card*", NAME="dri/card%n"
 
diff --git a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs
index 537d655a0..b165e0dc8 100644
--- a/etc/udev/udev.rules.devfs
+++ b/etc/udev/udev.rules.devfs
@@ -17,30 +17,30 @@
 #
 
 # ide block devices
-NUMBER, BUS="ide", id="0.0", NAME="ide/host0/bus0/target0/lun0/%D"
-NUMBER, BUS="ide", id="0.1", NAME="ide/host0/bus0/target1/lun0/%D"
-NUMBER, BUS="ide", id="1.0", NAME="ide/host0/bus1/target0/lun0/%D"
-NUMBER, BUS="ide", id="1.1", NAME="ide/host0/bus1/target1/lun0/%D"
+BUS="ide", id="0.0", NAME="ide/host0/bus0/target0/lun0/%D"
+BUS="ide", id="0.1", NAME="ide/host0/bus0/target1/lun0/%D"
+BUS="ide", id="1.0", NAME="ide/host0/bus1/target0/lun0/%D"
+BUS="ide", id="1.1", NAME="ide/host0/bus1/target1/lun0/%D"
 
 # md block devices
-REPLACE, KERNEL="md[0-9]*", NAME="md/%n"
+KERNEL="md[0-9]*", NAME="md/%n"
 
 # tty devices
-REPLACE, KERNEL="tty[0-9]*", NAME="vc/%n"
-REPLACE, KERNEL="ttyS[0-9]*", NAME="tts/%n"
-REPLACE, KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
+KERNEL="tty[0-9]*", NAME="vc/%n"
+KERNEL="ttyS[0-9]*", NAME="tts/%n"
+KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
 
 # vc devices
-REPLACE, KERNEL="vcs",        NAME="vcc/0"
-REPLACE, KERNEL="vcs[0-9]*",  NAME="vcc/%n"
-REPLACE, KERNEL="vcsa",       NAME="vcc/a0"
-REPLACE, KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
+KERNEL="vcs",        NAME="vcc/0"
+KERNEL="vcs[0-9]*",  NAME="vcc/%n"
+KERNEL="vcsa",       NAME="vcc/a0"
+KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
 
 # v4l devices
-REPLACE, KERNEL="video[0-9]*", NAME="v4l/video%n"
-REPLACE, KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-REPLACE, KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-REPLACE, KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
+KERNEL="video[0-9]*", NAME="v4l/video%n"
+KERNEL="radio[0-9]*", NAME="v4l/radio%n"
+KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
+KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
 
 # dm devices
-IGNORE, KERNEL="dm-[0-9]*"
+KERNEL="dm-[0-9]*", NAME=""
diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index e752fd021..51c8bdd99 100644
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -23,33 +23,33 @@
 ###########################################################
 
 # 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"
+BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-42:0:0:1", NAME="%c"
 
 # A usb camera.
-LABEL, 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
-LABEL, BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
+BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
 
 # USB HP printer to be called lp_hp
-LABEL, 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
-NUMBER, BUS="pci", ID="00:0b.0", NAME="dsp"
+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"
+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"
+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"
+BUS="usb", PLACE="2.3", NAME="mouse1"
+BUS="usb", PLACE="2.4", NAME="mouse2"
 
 # ttyUSB1 should always be called visor
-REPLACE, KERNEL="ttyUSB1", NAME="visor"
-REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
+KERNEL="ttyUSB1", NAME="visor"
+KERNEL="ttyUSB0", NAME="pl2303"
 
 
 ###########################################################
@@ -60,38 +60,38 @@ REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
 
 # devfs-names for ide-devices (uncomment only one)
 #  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-CALLOUT, BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
+BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c"
  
 # fb devices
-REPLACE, KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
+KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
 
 # loop devices
-REPLACE, KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
+KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
 
 # md block devices
-REPLACE, KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
+KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
 
 # pty devices
-REPLACE, KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-REPLACE, KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
+KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
+KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
 
 # ram devices
-REPLACE, KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
+KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
 
 # tty devices
-REPLACE, KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
-REPLACE, KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
-REPLACE, KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
+KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
+KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
+KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
 
 # vc devices
-REPLACE, KERNEL="vcs",        NAME="vcc/0", SYMLINK="%k"
-REPLACE, KERNEL="vcs[0-9]*",  NAME="vcc/%n", SYMLINK="%k"
-REPLACE, KERNEL="vcsa",       NAME="vcc/a0", SYMLINK="%k"
-REPLACE, KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
+KERNEL="vcs",        NAME="vcc/0", SYMLINK="%k"
+KERNEL="vcs[0-9]*",  NAME="vcc/%n", SYMLINK="%k"
+KERNEL="vcsa",       NAME="vcc/a0", SYMLINK="%k"
+KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
 
 # v4l devices
-REPLACE, KERNEL="video[0-9]*", NAME="v4l/video%n"
-REPLACE, KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-REPLACE, KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-REPLACE, KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
+KERNEL="video[0-9]*", NAME="v4l/video%n"
+KERNEL="radio[0-9]*", NAME="v4l/radio%n"
+KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
+KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"