rules: Ubuntu merge - use group "cdrom"

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 0eb401cda29ee160a5170dc042a79a9a4e31a213..d6533d6bc74b0c11e5d58a871abe0af9b96cbc8b 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -40,8 +40,7 @@ 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"
+SUBSYSTEM=="dvb", 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"
@@ -59,21 +58,23 @@ 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"
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="hd[0-9]*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", 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"
+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=="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"
 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"
-KERNEL=="pktcdvd[0-9]*",       NAME="pktcdvd/%k"
-KERNEL=="pktcdvd",             NAME="pktcdvd/control"
 SUBSYSTEM=="bsg",              NAME="bsg/%k"
 SUBSYSTEM=="aoe",              NAME="etherd/%k", GROUP="disk", MODE="0220"
 SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"