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=45767991756250c124887b463787e46ccfe17faa;hp=75a3e6d39f741fc75859274ca9ddbdaf6a6d3732;hb=d4e0db3c5de9a4899c87a4cf09b74f8bdc764060;hpb=f63dc3b74f67483b38f7fbd926bf10f5cac73387

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 75a3e6d39..457679917 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+SUBSYSTEM=="block", SYMLINK+="block/%M:%m"
+SUBSYSTEM!="block", SYMLINK+="char/%M:%m"
+
 KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
 KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
 KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS+="last_rule"
@@ -17,51 +20,56 @@ KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # mem
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
-KERNEL=="null",			SYMLINK+="XOR"
-KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
+KERNEL=="null",			SYMLINK+="X0R"
+KERNEL=="mem|kmem|port|nvram",	GROUP="kmem", MODE="0640"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 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"
+KERNEL=="vttuner*",		GROUP="video"
+KERNEL=="vtx*|vbi*",		GROUP="video"
+KERNEL=="winradio*",		GROUP="video"
 KERNEL=="vbi0",			SYMLINK+="vbi"
 KERNEL=="radio0",		SYMLINK+="radio"
 KERNEL=="video0",		SYMLINK+="video"
 
 # graphics
-KERNEL=="agpgart",		MODE="0600"
-KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
+KERNEL=="agpgart",		MODE="0600", GROUP="video"
+KERNEL=="card[0-9]*",		NAME="dri/%k"
 KERNEL=="fb0",			SYMLINK+="fb"
+KERNEL=="pmu",			GROUP="video"
+KERNEL=="nvidia*|nvidiactl*",	GROUP="video"
+SUBSYSTEM=="graphics",		GROUP="video"
 
 # DVB video
 SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
+SUBSYSTEM=="dvb",		GROUP="video"
 
 # Firewire
-KERNEL=="dv1394*",		SYMLINK+="dv1394/%n"
-KERNEL=="video1394*",		NAME="video1394/%n"
-
-# firmware class requests
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
+KERNEL=="dv1394[0-9]*",		NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394[0-9]*",	NAME="video1394/%n", GROUP="video"
+KERNEL=="raw1394*",		GROUP="video"
 
 # libusb device nodes
-SUBSYSTEM=="usb", ACTION=="add", 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=="lp[0-9]*",		GROUP="lp"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
 
 # block, tapes, block-releated
 SUBSYSTEM=="block", GROUP="disk"
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
 KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
@@ -71,13 +79,14 @@ KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
-KERNEL=="rawctl",		NAME="raw/%k", GROUP="disk"
+KERNEL=="rawctl",		GROUP="disk"
 SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="qft0",			SYMLINK+="ftape"
 SUBSYSTEM=="bsg",		NAME="bsg/%k"
-SUBSYSTEM=="aoe",		NAME="etherd/%k", GROUP="disk"
+SUBSYSTEM=="aoe",		NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
@@ -92,15 +101,20 @@ KERNEL=="fuse",			MODE="0666"
 KERNEL=="rtc|rtc0",		MODE="0644"
 KERNEL=="rtc0",			SYMLINK+="rtc"
 KERNEL=="auer[0-9]*",		NAME="usb/%k"
-KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
+KERNEL=="hw_random",		NAME="hwrng"
 KERNEL=="mmtimer",		MODE="0644"
 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"
+KERNEL=="dabusb[0-9]*",		NAME="usb/%k"
+KERNEL=="usbdpfp[0-9]*",	NAME="usb/%k"
+KERNEL=="cpad[0-9]*",		NAME="usb/%k"
 
 # do not delete static device nodes
 ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"