From 515e50555cb9776e425d498197eb382a22a51a04 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@suse.de>
Date: Wed, 15 Feb 2006 21:03:25 +0100
Subject: [PATCH] update Gentoo rules

---
 etc/udev/gentoo/udev.rules | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index 6614c76394..24f67be85a 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -22,8 +22,8 @@ KERNEL=="console",		NAME="%k", GROUP="tty", MODE="0600"
 KERNEL=="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
 
 # tty devices
-KERNEL=="ttyS[0-9]*",	NAME="tts/%n", SYMLINK+="%k", GROUP="tty"
-KERNEL=="ttyUSB[0-9]*",	NAME="tts/USB%n", GROUP="tty", MODE="0660"
+KERNEL=="ttyS[0-9]*",	NAME="%k", SYMLINK="tts/%n", GROUP="tty"
+KERNEL=="ttyUSB[0-9]*",	NAME="%k", SYMLINK="tts/USB%n", GROUP="tty", MODE="0660"
 KERNEL=="ippp0",	NAME="%k", GROUP="tty"
 KERNEL=="isdn*"		NAME="%k", GROUP="tty"
 KERNEL=="dcbri*",	NAME="%k", GROUP="tty"
@@ -133,7 +133,7 @@ KERNEL=="dnrtmsg",	NAME="netlink/%k"
 KERNEL=="tap*",		NAME="netlink/%k"
 
 # network devices
-KERNEL=="tun",		NAME="net/%k"
+KERNEL=="tun",		NAME="net/%k",	MODE="0600"
 
 # ramdisk devices
 KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
@@ -183,7 +183,7 @@ KERNEL=="vbi[0-9]*",	NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
 KERNEL=="vtx[0-9]*",	NAME="v4l/vtx%n", GROUP="video"
 
 # dvb devices
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # Asterisk Zaptel devices
 KERNEL=="zapctl",	NAME="zap/ctl"
@@ -210,6 +210,7 @@ KERNEL=="lp*",		NAME="%k", GROUP="lp"
 KERNEL=="irlpt",	NAME="%k", GROUP="lp"
 KERNEL=="usblp",	NAME="%k", GROUP="lp"
 KERNEL=="lp*",		NAME="%k", GROUP="lp"
+KERNEL=="parport*",	NAME="%k", GROUP="lp"
 
 # tape devices
 KERNEL=="ht*",		NAME="%k", GROUP="tape"
@@ -299,10 +300,10 @@ SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/u
 
 # be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
 # run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
-ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
+ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd $env{SUBSYSTEM}"
 
 # always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
+RUN+="/sbin/udev_run_devd $env{SUBSYSTEM}"
 
 # debugging monitor
 RUN+="socket:/org/kernel/udev/monitor"