[PATCH] Update the Gentoo udev.rules and udev.permissions files

These are very good devfs-like rules for others to use if they want to.

2 files changed, 85 insertions, 59 deletions

diff --git a/etc/udev/udev.permissions.gentoo b/etc/udev/udev.permissions.gentoo
index c2016bc280..d5ef9eaa37 100644
--- a/etc/udev/udev.permissions.gentoo
+++ b/etc/udev/udev.permissions.gentoo
@@ -1,5 +1,5 @@
 # /etc/udev/udev.permissions:  permission/ownership map for udev
-# $Header: /home/cvsroot/gentoo-x86/sys-fs/udev/files/udev.permissions,v 1.2 2003/12/26 23:32:44 azarah Exp $
+# $Header: /home/cvsroot/gentoo-x86/sys-fs/udev/files/udev.permissions,v 1.3 2004/01/01 03:41:24 azarah Exp $
 
 # console devices
 console:root:tty:0600
@@ -34,6 +34,20 @@ vcsa:root:root:0600
 vcsa[0-9]*:root:root:0600
 vcc/*:root:root:0600
 
+# memory devices
+random:root:root:0666
+urandom:root:root:0444
+mem:root:kmem:0640
+kmem:root:kmem:0640
+port:root:kmem:0640
+full:root:root:0666
+null:root:root:0666
+zero:root:root:0666
+
+# misc devices
+nvram:root:root:0660
+rtc:root:root:0660
+
 # floppy devices
 fd[01]*:root:floppy:0660
 
@@ -117,6 +131,9 @@ npt*:root:tape:0660
 st*:root:tape:0660
 nst*:root:tape:0660
 
+# dm devices
+dm-*:root:root:0640
+
 # memstick devices
 memstick*:root:root:0600
 
@@ -135,10 +152,11 @@ fb[0-9]*:root:root:0600
 fb/*:root:root:0600
 
 # kbd devices
-kbd:root:root:0600
+kbd:root:root:0644
 
 # joystick devices
-js[0-9]*:root:root:0600
+js[0-9]*:root:root:0644
+djs[0-9]*:root:root:0644
 
 # v4l devices
 video*:root:video:0660
diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index 7e8966961d..81c370e03e 100644
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -1,52 +1,43 @@
 # /etc/udev/udev.rules:  device naming rules for udev
-# $Header: /home/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules,v 1.1 2003/12/26 23:32:44 azarah Exp $
-#
-# 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 of the external PROGRAM (note, this doesn't work within
-#      the PROGRAM field for the obvious reason.)
+# $Header: /home/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.5 2004/02/08 16:59:29 azarah Exp $
 #
+# 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.
 
 ###########################################################
 #
-# Add your own rules here
+# Add your own rules here (examples are commented)
 #
 ###########################################################
 
 # Looking for scsi bus id 42:0:0:1
-BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="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"
+#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"
+#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"
+#BUS="pci", ID="00:0b.0", NAME="dsp"
 
 # sound card with PCI bus id 00:07.1 to be the second sound card
-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
-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
-BUS="usb", PLACE="2.3", NAME="mouse1"
-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
-KERNEL="ttyUSB1", NAME="visor"
-KERNEL="ttyUSB0", NAME="pl2303"
+#KERNEL="ttyUSB1", NAME="visor"
+#KERNEL="ttyUSB0", NAME="pl2303"
 
 
 ###########################################################
@@ -57,33 +48,74 @@ KERNEL="ttyUSB0", NAME="pl2303"
 
 # devfs-names for ide-devices (uncomment only one)
 #  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
- 
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c"
+
+# 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"
+
+# dm devices (ignore them)
+KERNEL="dm-[0-9]*",     NAME=""
+KERNEL="device-mapper", NAME="mapper/control"
+
 # fb devices
 KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
 
+# floppy devices
+KERNEL="fd[0-9]*", NAME="floppy/%n", SYMLINK="%k"
+
+# i2c devices
+KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
+
+# input devices
+KERNEL="mice",        NAME="input/mice"
+KERNEL="mouse[0-9]*", NAME="input/mouse%n"
+KERNEL="event[0-9]*", NAME="input/event%n"
+KERNEL="js*",         NAME="input/%k"
+KERNEL="ts*",         NAME="input/%k"
+
 # loop devices
 KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
 
 # md block devices
 KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
 
+# misc devices
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
+
 # pty devices
 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
+# ramdisk devices
 KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
 
+# sound devices
+KERNEL="adsp",       NAME="sound/adsp"        SYMLINK="%k"
+KERNEL="audio",      NAME="sound/audio",      SYMLINK="%k"
+KERNEL="dsp",        NAME="sound/dsp",        SYMLINK="%k"
+KERNEL="mixer",      NAME="sound/mixer",      SYMLINK="%k"
+KERNEL="sequencer",  NAME="sound/sequencer",  SYMLINK="%k"
+KERNEL="sequencer2", NAME="sound/sequencer2", SYMLINK="%k"
+
 # tty devices
-KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
-KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
+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
-KERNEL="vcs",        NAME="vcc/0", SYMLINK="%k"
-KERNEL="vcs[0-9]*",  NAME="vcc/%n", SYMLINK="%k"
-KERNEL="vcsa",       NAME="vcc/a0", 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
@@ -92,27 +124,3 @@ 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 them)
-KERNEL="dm-[0-9]*", NAME=""
-
-# i2c devices
-KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
-
-# loop devices
-KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
-
-# framebuffer devices
-KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
-
-# misc devices
-KERNEL="rtc",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux", NAME="misc/%k", SYMLINK="%k"
-
-# 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"
-