simplify "symlink name stack"

[elogind.git] / rules / rules.d / 50-udev-default.rules

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index f19fb63afbc4076e5be7c6e225829d73b8295796..200e2b4e51b8fba52f6243c3d066de3257cd595b 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -1,7 +1,7 @@
 # do not edit this file, it will be overwritten on update
 
-SUBSYSTEM=="block", SYMLINK+="block/%M:%m"
-SUBSYSTEM!="block", SYMLINK+="char/%M:%m"
+SUBSYSTEM=="block", SYMLINK{unique}+="block/%M:%m"
+SUBSYSTEM!="block", SYMLINK{unique}+="char/%M:%m"
 
 KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
 KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
@@ -43,9 +43,12 @@ SUBSYSTEM=="drm",            GROUP="video"
 # DVB (video)
 SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"
 
-# Firewire
+# FireWire (dv1394 and video1394 drivers)
 KERNEL=="dv1394-[0-9]*",       NAME="dv1394/%n", GROUP="video"
 KERNEL=="video1394-[0-9]*",    NAME="video1394/%n", GROUP="video"
+# FireWire (firewire-core driver: IIDC devices, AV/C devices)
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
 
 # libusb device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
@@ -57,6 +60,10 @@ SUBSYSTEM=="ppdev",          GROUP="lp"
 SUBSYSTEM=="usb",              KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
 KERNEL=="lp[0-9]*",            GROUP="lp"
 KERNEL=="irlpt[0-9]*",         GROUP="lp"
+# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
+# the ones from the old usblp kernel module
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
 
 # block
 SUBSYSTEM=="block", GROUP="disk"
@@ -78,7 +85,7 @@ KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
 KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
 SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
 
-# block-releated
+# block-related
 KERNEL=="sch[0-9]*", GROUP="disk"
 SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
 KERNEL=="pg[0-9]*", GROUP="disk"
@@ -91,7 +98,7 @@ SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
 KERNEL=="tun",                 NAME="net/%k", MODE="0666"
-KERNEL=="rfkill",              MODE="0664"
+KERNEL=="rfkill",              MODE="0644"
 
 # CPU
 KERNEL=="cpu[0-9]*",           NAME="cpu/%n/cpuid", MODE="0444"