From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 21 Dec 2008 12:01:40 +0000 (+0100)
Subject: rules: more changes toward Ubuntu rules merge
X-Git-Tag: 174~1250
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=23456b19eba54a5b9d760f134b574191f459c71d;hp=c4e63d54124062659f9d8cf18ad3cb7430326938

rules: more changes toward Ubuntu rules merge

specialix_rioctl: no kernel name symlink
specialix_sxctl: no kernel name symlink
bus/usb: 0644 -> 0664
ppdev: lp
dri: 0666 -> 0660
js: no kernel name symlink
---

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index c58e24f66..c2dda7688 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -27,8 +27,8 @@ KERNEL=="ram1",			SYMLINK+="ram"
 
 # input
 KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0600"
-KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644", SYMLINK+="%k"
+KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0640"
+KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644"
 
 # video4linux
 SUBSYSTEM=="video4linux",	GROUP="video"
@@ -41,7 +41,7 @@ KERNEL=="video0",		SYMLINK+="video"
 
 # graphics
 KERNEL=="agpgart",		MODE="0600", GROUP="video"
-KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
+KERNEL=="card[0-9]*",		NAME="dri/%k"
 KERNEL=="fb0",			SYMLINK+="fb"
 KERNEL=="pmu",			GROUP="video"
 KERNEL=="nvidia*|nvidiactl*",	GROUP="video"
@@ -57,11 +57,12 @@ KERNEL=="video1394*",		NAME="video1394/%n"
 KERNEL=="dv1394*|video1394*|raw1394*",	GROUP="video"
 
 # libusb device nodes
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
 
 # printer
 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=="irlpt[0-9]*",		GROUP="lp"
@@ -106,8 +107,8 @@ KERNEL=="rflash[0-9]*",		MODE="0400"
 KERNEL=="rrom[0-9]*",		MODE="0400"
 KERNEL=="sbpcd0",		SYMLINK+="sbpcd"
 KERNEL=="slram[0-9]*", 		SYMLINK+="xpram%n"
-KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
-KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
+KERNEL=="sxctl",		NAME="specialix_sxctl""
+KERNEL=="rioctl",		NAME="specialix_rioctl"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 KERNEL=="hiddev[0-9]*",		NAME="usb/%k"
 KERNEL=="legousbtower[0-9]*",	NAME="usb/%k"