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 d6533d6bc74b0c11e5d58a871abe0af9b96cbc8b..120c58152d4ea02ee1baccad8d521f996b90d6ea 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -12,10 +12,10 @@ 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=="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="uucp"
-KERNEL=="hvc*|hvsi*",          GROUP="uucp"
+KERNEL=="mwave",               NAME="modems/mwave", GROUP="dialout"
+KERNEL=="hvc*|hvsi*",          GROUP="dialout"
 
 # mem
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
@@ -39,8 +39,9 @@ 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", 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[0-9]*",                NAME="dv1394/%n", GROUP="video"
@@ -57,21 +58,28 @@ SUBSYSTEM=="usb",           KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
 KERNEL=="lp[0-9]*",            GROUP="lp"
 KERNEL=="irlpt[0-9]*",         GROUP="lp"
 
-# block, tapes, block-releated
+# 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"
-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"
+
+# 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}=="0|1|8", GROUP="disk"
-KERNEL=="sg[0-9]*",            ATTRS{type}=="4|5", GROUP="cdrom"
-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/rawctl", GROUP="disk"
 SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"