X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Frules.d%2F50-udev-default.rules;h=f5b181dcc06ea2c3387b7f34d670098dae129a81;hp=a5f08233ed5788098152a533db88a2fbd76e7b34;hb=b3ca87a04a6bc32d852774211b35313ec8a09da1;hpb=421fbc71c7e951dac900eabd445dfe577158b9c3

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index a5f08233e..f5b181dcc 100644
--- 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"
 
@@ -36,29 +31,28 @@ 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"
-
-# FireWire (deprecated dv1394 and video1394 drivers)
-KERNEL=="dv1394-[0-9]*",	NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394-[0-9]*",	NAME="video1394/%n", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
 
 # libusb device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
 
 # printer
 KERNEL=="parport[0-9]*",	GROUP="lp"
@@ -67,10 +61,7 @@ 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"
@@ -100,18 +91,16 @@ 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", \
+  RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections"
+
 SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc"
 KERNEL=="mmtimer",		MODE="0644"
 KERNEL=="rflash[0-9]*",		MODE="0400"
 KERNEL=="rrom[0-9]*",		MODE="0400"
-
-# do not delete static device nodes
-ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"