X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=etc%2Fudev%2Frules.d%2F50-udev-default.rules;h=718d1899f56acb1fd8cc15b04638db7488ae3256;hb=3c35425071caa4379ebeeed2680f35829bbfd9a8;hp=f869f51550a89a0398a2c06a4e5743909ef529b9;hpb=b6e4b08dc14444790c1560108e93a67e57e1148b;p=elogind.git

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index f869f5155..718d1899f 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -1,13 +1,12 @@
 # do not edit this file, it will be overwritten on update
 
-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"
-KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]*",		GROUP="tty", MODE="0620", OPTIONS="last_rule"
-KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
-KERNEL=="tty0",			SYMLINK+="systty"
+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"
+KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS+="last_rule"
+KERNEL=="tty[0-9]*",		GROUP="tty", MODE="0620", OPTIONS+="last_rule"
+KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS+="last_rule"
+KERNEL=="console",		MODE="0600", OPTIONS+="last_rule"
 
 # serial
 KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
@@ -20,7 +19,6 @@ KERNEL=="lirc0",		SYMLINK+="lirc"
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
-KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
 
@@ -40,7 +38,7 @@ KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
 KERNEL=="fb0",			SYMLINK+="fb"
 
 # DVB video
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c" 
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
 
 # Firewire
 KERNEL=="dv1394*",		SYMLINK+="dv1394/%n"
@@ -68,7 +66,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio
 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"
 KERNEL=="sch[0-9]*",		GROUP="disk"
-KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
+KERNEL=="sg[0-9]*",		ATTRS{type}!="3|6", GROUP="disk", MODE="0640"
 KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
@@ -78,6 +76,8 @@ 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"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
@@ -89,8 +89,9 @@ KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",			MODE="0666"
-KERNEL=="rtc",			MODE="0644"
-KERNEL=="auer[0-9]*"		NAME="usb/%k"
+KERNEL=="rtc|rtc0",		MODE="0644"
+KERNEL=="rtc0",			SYMLINK+="rtc"
+KERNEL=="auer[0-9]*",		NAME="usb/%k"
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
 KERNEL=="mmtimer",		MODE="0644"
 KERNEL=="rflash[0-9]*",		MODE="0400"
@@ -101,3 +102,6 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 
+# do not delete static device nodes
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+