- updated, cleanup, fixed usb printers

Changed files:
    udev.rules -> 1.22

diff --git a/udev.rules b/udev.rules
index 7a8ec15db4bc7d78c6d2f277fc9d46162682a818..31942fa469665234cdb5d758c77525ae0471f606 100644 (file)
--- a/udev.rules
+++ b/udev.rules
@@ -53,12 +53,14 @@ KERNEL=="ida*",             PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYM
 KERNEL=="rd*",         PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
 
 # dri devices
+SUBSYSTEM=="graphics"  GROUP="video"
 KERNEL=="card*",       NAME="dri/card%n", GROUP="video"
 KERNEL=="nvidia*",     NAME="%k", GROUP="video"
+KERNEL=="nvidiactl*",  NAME="%k", GROUP="video"
 KERNEL=="3dfx*",       NAME="%k", GROUP="video"
 
 # alsa devices
-SUBSYSTEM=="sound", GROUP="audio"
+SUBSYSTEM="snd",               GROUP="audio"
 KERNEL=="controlC[0-9]*",      NAME="snd/%k"
 KERNEL=="hw[CD0-9]*",          NAME="snd/%k"
 KERNEL=="pcm[CD0-9cp]*",       NAME="snd/%k"
@@ -97,6 +99,7 @@ KERNEL=="mouse*",     NAME="input/%k", MODE="0644"
 KERNEL=="event*",      NAME="input/%k", MODE="0600"
 KERNEL=="js*",         NAME="input/%k", MODE="664", GROUP="sys"
 KERNEL=="ts*",         NAME="input/%k", MODE="0600"
+KERNEL=="lirc0",       NAME="%k", SYMLINK+="lirc"
 
 # loop devices
 KERNEL=="loop[0-9]*",  NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
@@ -146,6 +149,7 @@ KERNEL=="raw[0-9]*",        NAME="raw/%k", GROUP="disk"
 KERNEL=="ram*",                NAME="%k", GROUP="disk"
 
 # sound devices
+SUBSYSTEM=="sound",            GROUP="audio"
 KERNEL=="adsp",                        NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
 KERNEL=="adsp[0-9]*",          NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
 KERNEL=="audio",               NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
@@ -164,7 +168,7 @@ KERNEL=="mem",              NAME="%k", MODE="0640", GROUP="kmem"
 KERNEL=="kmem",                NAME="%k", MODE="0640", GROUP="kmem"
 KERNEL=="port",                NAME="%k", MODE="0640", GROUP="kmem"
 KERNEL=="full",                NAME="%k", MODE="0666"
-KERNEL=="null",                NAME="%k", MODE="0666"
+KERNEL=="null",                NAME="%k", MODE="0666", SYMLINK+="drzewo"
 KERNEL=="zero",                NAME="%k", MODE="0666"
 
 # usb devices
@@ -172,13 +176,16 @@ 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", GROUP="lp"
 
 # v4l devices
+SUBSYSTEM=="video4linux",      GROUP="video"
 KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"
 KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video"
 KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
 KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", GROUP="video"
+KERNEL=="video0",      SYMLINK+="video"
+KERNEL=="radio0",      SYMLINK+="radio"
+KERNEL=="vbi0",                SYMLINK+="vbi"
 
 # dvb devices
 KERNEL=="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c", GROUP="video", MODE="0660"
@@ -203,11 +210,10 @@ KERNEL=="zip*",           NAME="%k", GROUP="disk"
 # ls120 devices
 KERNEL=="ls120",       NAME="%k", GROUP="disk"
 
-# lp devices
-KERNEL=="lp*",         NAME="%k", GROUP="lp"
-KERNEL=="irlpt",       NAME="%k", GROUP="lp"
-KERNEL=="usblp",       NAME="%k", GROUP="lp"
-KERNEL=="lp*",         NAME="%k", GROUP="lp"
+# printer devices
+SUBSYSTEM=="usb",      KERNEL=="lp*", ACTION=="add", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
+SUBSYSTEM=="printer",  KERNEL=="lp*", ACTION=="add", NAME="%k", GROUP="lp"
+KERNEL=="irlpt*",      NAME="%k", GROUP="lp"
 
 # disk devices
 KERNEL=="ht*",         NAME="%k", GROUP="disk"