X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Frules.d%2F50-udev-default.rules;h=865d95f41ec24ae67b4bebd721a3d37aee10735b;hp=3c0f747effbf65b68400c290be6284a2f0604004;hb=f2a2983604fa6876fc297c9156b7ad0f04a482e8;hpb=1bbc1a9cb0d65c1326e18170f3b445047cb1ea80

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 3c0f747ef..865d95f41 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -1,8 +1,5 @@
 # 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"
@@ -41,8 +38,8 @@ 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"
@@ -53,12 +50,9 @@ 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
 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"
@@ -106,7 +97,7 @@ KERNEL=="rfkill",		MODE="0644"
 # CPU
 KERNEL=="cpu[0-9]*",		MODE="0444"
 
-KERNEL=="fuse",			MODE="0666", OPTIONS+="static_node=fuse" \
+KERNEL=="fuse",			MODE="0666", OPTIONS+="static_node=fuse", \
   RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections"
 
 SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc"