rules: restore rule to set cdrom group for optical drives

[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 7e09ea19bb1bf18c23cf2f8797b943c398c59932..3ef6783037c973aa3558ebb0d41559ebf83b0f99 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -1,19 +1,14 @@
 # do not edit this file, it will be overwritten on update
 
-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"
 KERNEL=="ptmx",                        GROUP="tty", MODE="0666"
 KERNEL=="tty",                 GROUP="tty", MODE="0666"
 KERNEL=="tty[0-9]*",           GROUP="tty", MODE="0620"
-KERNEL=="console",             MODE="0600"
 KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
 
 # serial
 KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-KERNEL=="ppp",                 MODE="0600"
 KERNEL=="mwave",               GROUP="dialout"
 KERNEL=="hvc*|hvsi*",          GROUP="dialout"
 
@@ -25,6 +20,7 @@ KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
 
 # input
+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
 KERNEL=="mouse*|mice|event*",  MODE="0640"
 KERNEL=="ts[0-9]*|uinput",     MODE="0640"
 KERNEL=="js[0-9]*",            MODE="0644"
@@ -36,41 +32,36 @@ KERNEL=="vtx*|vbi*",                GROUP="video"
 KERNEL=="winradio*",           GROUP="video"
 
 # graphics
-KERNEL=="agpgart",             MODE="0600", GROUP="video"
+KERNEL=="agpgart",             GROUP="video"
 KERNEL=="pmu",                 GROUP="video"
 KERNEL=="nvidia*|nvidiactl*",  GROUP="video"
 SUBSYSTEM=="graphics",         GROUP="video"
 SUBSYSTEM=="drm",              GROUP="video"
 
 # sound
-SUBSYSTEM=="sound",            GROUP="audio"
-KERNEL=="mixer0",              SYMLINK+="mixer"
+SUBSYSTEM=="sound",            GROUP="audio", \
+  OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
 
 # DVB (video)
 SUBSYSTEM=="dvb", GROUP="video"
 
 # FireWire (firewire-core driver: IIDC devices, AV/C devices)
 SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
 SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
 
-# FireWire (deprecated dv1394 and video1394 drivers)
-KERNEL=="dv1394-[0-9]*",       NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394-[0-9]*",    NAME="video1394/%n", GROUP="video"
-
-# libusb device nodes
+# 'libusb' device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id"
 
 # printer
 KERNEL=="parport[0-9]*",       GROUP="lp"
 SUBSYSTEM=="printer",          KERNEL=="lp*", GROUP="lp"
 SUBSYSTEM=="ppdev",            GROUP="lp"
-SUBSYSTEM=="usb",              KERNEL=="lp*", 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="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
 
 # block
 SUBSYSTEM=="block", GROUP="disk"
@@ -79,7 +70,7 @@ SUBSYSTEM=="block", GROUP="disk"
 SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
 
 # cdrom
-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*". GROUP="cdrom"
 SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
 KERNEL=="pktcdvd", GROUP="cdrom"
@@ -100,14 +91,14 @@ SUBSYSTEM=="aoe", GROUP="disk", MODE="0220"
 SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
-KERNEL=="tun",                 MODE="0666"
+KERNEL=="tun",                 MODE="0666", OPTIONS+="static_node=net/tun"
 KERNEL=="rfkill",              MODE="0644"
 
 # CPU
 KERNEL=="cpu[0-9]*",           MODE="0444"
 
-# miscellaneous
-KERNEL=="fuse",                        MODE="0666"
+KERNEL=="fuse", ACTION=="add", MODE="0666", OPTIONS+="static_node=fuse"
+
 SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc"
 KERNEL=="mmtimer",             MODE="0644"
 KERNEL=="rflash[0-9]*",                MODE="0400"