aboutsummaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-12-21 13:17:37 +0100
committerKay Sievers <kay.sievers@vrfy.org>2008-12-21 13:17:37 +0100
commit41e7f55711db043370e1681bb5a97ebdeda5d6d3 (patch)
treecb83d4c5b2a66440a6fd64bb49c31a6787e4093c /rules
parent23456b19eba54a5b9d760f134b574191f459c71d (diff)
downloadudev-41e7f55711db043370e1681bb5a97ebdeda5d6d3.tar.gz
rules: more changes toward Ubuntu rules merge
dv1394*: no kernel name symlink lp*: no par* symlink hwrng: no kernel name symlink
Diffstat (limited to 'rules')
-rw-r--r--rules/rules.d/50-udev-default.rules10
1 files changed, 5 insertions, 5 deletions
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index c2dda768..67ed827a 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -52,9 +52,9 @@ SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/
SUBSYSTEM=="dvb", GROUP="video"
# Firewire
-KERNEL=="dv1394*", SYMLINK+="dv1394/%n"
-KERNEL=="video1394*", NAME="video1394/%n"
-KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
+KERNEL=="dv1394[0-9]*", NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394[0-9]*", NAME="video1394/%n", GROUP="video"
+KERNEL=="raw1394*", GROUP="video"
# libusb device nodes
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
@@ -64,7 +64,7 @@ KERNEL=="parport[0-9]*", GROUP="lp"
SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp"
SUBSYSTEM=="ppdev", GROUP="lp"
SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*", GROUP="lp", SYMLINK+="par%n"
+KERNEL=="lp[0-9]*", GROUP="lp"
KERNEL=="irlpt[0-9]*", GROUP="lp"
# block, tapes, block-releated
@@ -101,7 +101,7 @@ KERNEL=="fuse", MODE="0666"
KERNEL=="rtc|rtc0", MODE="0644"
KERNEL=="rtc0", SYMLINK+="rtc"
KERNEL=="auer[0-9]*", NAME="usb/%k"
-KERNEL=="hw_random", NAME="hwrng", SYMLINK+="%k"
+KERNEL=="hw_random", NAME="hwrng"
KERNEL=="mmtimer", MODE="0644"
KERNEL=="rflash[0-9]*", MODE="0400"
KERNEL=="rrom[0-9]*", MODE="0400"