rules: Ubuntu merge - s/uucp/dialout/

[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 c2dda7688e05c0b51456ab0c74266704de8503bf..120c58152d4ea02ee1baccad8d521f996b90d6ea 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -3,27 +3,23 @@
 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"
-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=="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=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
+KERNEL=="console",             MODE="0600"
 
 # serial
-KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
-KERNEL=="ppp",                 MODE="0600", OPTIONS+="ignore_remove"
-KERNEL=="mwave",               NAME="modems/mwave", GROUP="uucp"
-KERNEL=="hvc*|hvsi*",          GROUP="uucp"
-KERNEL=="lirc0",               SYMLINK+="lirc"
+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="dialout"
+KERNEL=="ppp",                 MODE="0600"
+KERNEL=="mwave",               NAME="modems/mwave", GROUP="dialout"
+KERNEL=="hvc*|hvsi*",          GROUP="dialout"
 
 # mem
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
-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"
@@ -35,26 +31,21 @@ 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", 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"
+# DVB (video)
+SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"
+SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # Firewire
-KERNEL=="dv1394*",             SYMLINK+="dv1394/%n"
-KERNEL=="video1394*",          NAME="video1394/%n"
-KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
+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", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
@@ -64,32 +55,40 @@ 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"
-KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
+# floppy
 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"
+
+# cdrom
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="hd[0-9]*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",       NAME="pktcdvd/%k", GROUP="cdrom"
+KERNEL=="pktcdvd",             NAME="pktcdvd/control", GROUP="cdrom"
+
+# tape
+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
+KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
+SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
+
+# block, block-releated
+SUBSYSTEM=="block", GROUP="disk"
+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
 KERNEL=="sch[0-9]*",           GROUP="disk"
-KERNEL=="sg[0-9]*",            ATTRS{type}!="3|6", GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*",  GROUP="disk"
+SUBSYSTEMS=="scsi", ATTRS{type}=="0", 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", NAME="raw/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", MODE="0220"
 SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
-KERNEL=="tun",                 NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
+KERNEL=="tun",                 NAME="net/%k", MODE="0666"
 
 # CPU
 KERNEL=="cpu[0-9]*",           NAME="cpu/%n/cpuid"
@@ -98,15 +97,12 @@ KERNEL=="microcode",                NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",                        MODE="0666"
-KERNEL=="rtc|rtc0",            MODE="0644"
-KERNEL=="rtc0",                        SYMLINK+="rtc"
+SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", 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""
 KERNEL=="rioctl",              NAME="specialix_rioctl"
 KERNEL=="iowarrior[0-9]*",     NAME="usb/%k"
@@ -118,4 +114,4 @@ KERNEL=="cpad[0-9]*",               NAME="usb/%k"
 
 # do not delete static device nodes
 ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
-
+ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"