[PATCH] Some updates for Gentoo's udev rules

Hi,

Here is a few updates for the udev.rules.gentoo from udev package.
I will summarise it briefly:

1)  The last change you did to legacy tty's is wrong.

I say this because:
1a)  The original devfs rules had both master and slave in /dev/pty:

nosferatu linux # grep devfs_name drivers/char/pty.c
        pty_driver->devfs_name = "pty/m";
        pty_slave_driver->devfs_name = "pty/s";
nosferatu linux #

1b)  If you refer to '2.6.8.1-mm1 Tty problems?', you will see that
the /dev/tty/ directory our rules create, replaces this symlink:

nosferatu portage # ls -l /dev/tty
crw-rw-rw-  1 root tty 5, 0 Nov 14 17:06 /dev/tty
nosferatu portage #

which is used to determine the controlling tty.

2)  Somebody added the /dev/cpu/microcode rule, but it was not run
as there was an older rule before that placing it in /dev/misc (which
is wrong).  Just remove the first broken rule

3)  Some form/tab cleanups.  Reorder rules alphabetically according to
device class to make searching/editing easier.

diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index 2e2f89f26ab05b92cffde565cad2ec4c7dd41375..1809232ed06636d13e85859c5f667468ff715f32 100644 (file)
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -21,32 +21,41 @@ BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYM
 #  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
 BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
 
-# DRI devices
-KERNEL="card*", NAME="dri/card%n"
+# dri devices
+KERNEL="card*",                NAME="dri/card%n"
 
 # alsa devices
 KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midiC[D0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
+KERNEL="hw[CD0-9]*",    NAME="snd/%k"
+KERNEL="pcm[CD0-9cp]*",         NAME="snd/%k"
+KERNEL="midiC[D0-9]*",  NAME="snd/%k"
+KERNEL="timer",                 NAME="snd/%k"
+KERNEL="seq",           NAME="snd/%k"
+
+# capi devices
+KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi*",                NAME="capi/%n"
+
+# cpu devices
+KERNEL="cpu[0-9]*",    NAME="cpu/%n/cpuid"
+KERNEL="msr[0-9]*",    NAME="cpu/%n/msr"
+KERNEL="microcode",    NAME="cpu/microcode"
 
 # dm devices (ignore them)
-KERNEL="dm-[0-9]*",     NAME=""
+KERNEL="dm-[0-9]*",    NAME=""
 # create a symlink named after the device map name
 # note devmap_name comes with extras/multipath
-#KERNEL="dm-[0-9]*",     PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
-KERNEL="device-mapper", NAME="mapper/control"
+#KERNEL="dm-[0-9]*",   PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+KERNEL="device-mapper",        NAME="mapper/control"
 
 # fb devices
-KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
+KERNEL="fb[0-9]*",     NAME="fb/%n", SYMLINK="%k"
 
 # floppy devices
-KERNEL="fd[0-9]*", NAME="floppy/%n", SYMLINK="%k"
+KERNEL="fd[0-9]*",     NAME="floppy/%n", SYMLINK="%k"
 
 # i2c devices
-KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
+KERNEL="i2c-[0-9]*",   NAME="i2c/%n", SYMLINK="%k"
 
 # input devices
 KERNEL="mice",         NAME="input/%k"
@@ -56,61 +65,17 @@ KERNEL="js*",               NAME="input/%k"
 KERNEL="ts*",          NAME="input/%k"
 
 # loop devices
-KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
+KERNEL="loop[0-9]*",   NAME="loop/%n", SYMLINK="%k"
 
 # md block devices
-KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
+KERNEL="md[0-9]*",     NAME="md/%n", SYMLINK="%k"
 
 # misc devices
-KERNEL="agpgart",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="microcode", NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="rtc",       NAME="misc/%k", SYMLINK="%k"
-KERNEL="uinput",    NAME="misc/%k", SYMLINK="%k"
-KERNEL="inotify",   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"
-
-# ramdisk devices
-KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
-
-# sound devices
-KERNEL="adsp",            NAME="sound/%k", SYMLINK="%k"
-KERNEL="adsp[0-9]*",      NAME="sound/%k", SYMLINK="%k"
-KERNEL="audio",           NAME="sound/%k", SYMLINK="%k"
-KERNEL="audio[0-9]*",     NAME="sound/%k", SYMLINK="%k"
-KERNEL="dsp",             NAME="sound/%k", SYMLINK="%k"
-KERNEL="dsp[0-9]*",       NAME="sound/%k", SYMLINK="%k"
-KERNEL="mixer",           NAME="sound/%k", SYMLINK="%k"
-KERNEL="mixer[0-9]*",     NAME="sound/%k", SYMLINK="%k"
-KERNEL="sequencer",       NAME="sound/%k", SYMLINK="%k"
-KERNEL="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-
-# tty devices
-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="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
-
-# v4l devices
-KERNEL="video[0-9]*", NAME="v4l/video%n", SYMLINK="video%n"
-KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n",   SYMLINK="vbi%n"
-KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
-
-# USB devices
-KERNEL="hiddev*",      NAME="usb/%k"
-KERNEL="auer*",                NAME="usb/%k"
-KERNEL="legousbtower*",        NAME="usb/%k"
-KERNEL="dabusb*",      NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
+KERNEL="agpgart",      NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",                NAME="misc/%k", SYMLINK="%k"
+KERNEL="rtc",          NAME="misc/%k", SYMLINK="%k"
+KERNEL="uinput",       NAME="misc/%k", SYMLINK="%k"
+KERNEL="inotify",      NAME="misc/%k", SYMLINK="%k"
 
 # netlink devices
 KERNEL="route",                NAME="netlink/%k"
@@ -126,17 +91,52 @@ KERNEL="ip6_fw",   NAME="netlink/%k"
 KERNEL="dnrtmsg",      NAME="netlink/%k"
 KERNEL="tap*",         NAME="netlink/%k"
 
-# CAPI devices
-KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*",                NAME="capi/%n"
-
-# Network devices
+# network devices
 KERNEL="tun",          NAME="net/%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="pty/s%n", SYMLINK="%k"
+
+# ramdisk devices
+KERNEL="ram[0-9]*",    NAME="rd/%n", SYMLINK="%k"
+
 # raw devices
-KERNEL="raw[0-9]*",     NAME="raw/%k"
+KERNEL="raw[0-9]*",    NAME="raw/%k"
+
+# sound devices
+KERNEL="adsp",           NAME="sound/%k", SYMLINK="%k"
+KERNEL="adsp[0-9]*",     NAME="sound/%k", SYMLINK="%k"
+KERNEL="audio",                  NAME="sound/%k", SYMLINK="%k"
+KERNEL="audio[0-9]*",    NAME="sound/%k", SYMLINK="%k"
+KERNEL="dsp",            NAME="sound/%k", SYMLINK="%k"
+KERNEL="dsp[0-9]*",      NAME="sound/%k", SYMLINK="%k"
+KERNEL="mixer",                  NAME="sound/%k", SYMLINK="%k"
+KERNEL="mixer[0-9]*",    NAME="sound/%k", SYMLINK="%k"
+KERNEL="sequencer",      NAME="sound/%k", SYMLINK="%k"
+KERNEL="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+
+# tty devices
+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"
+
+# usb devices
+KERNEL="hiddev*",              NAME="usb/%k"
+KERNEL="auer*",                        NAME="usb/%k"
+KERNEL="legousbtower*",                NAME="usb/%k"
+KERNEL="dabusb*",              NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
+
+# 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="vcsa[0-9]*",   NAME="vcc/a%n", SYMLINK="%k"
+
+# v4l devices
+KERNEL="video[0-9]*",  NAME="v4l/video%n",     SYMLINK="video%n"
+KERNEL="radio[0-9]*",  NAME="v4l/radio%n"
+KERNEL="vbi[0-9]*",    NAME="v4l/vbi%n",       SYMLINK="vbi%n"
+KERNEL="vtx[0-9]*",    NAME="v4l/vtx%n"
 
-# cpu devices
-KERNEL="cpu[0-9]*",    NAME="cpu/%n/cpuid"
-KERNEL="msr[0-9]*",    NAME="cpu/%n/msr"
-KERNEL="microcode",    NAME="cpu/microcode"