X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=etc%2Fudev%2Fsuse%2F50-udev-default.rules;h=2d4c418e1ef04bcafdbbf1409469ae6b10ac25ec;hb=7586b637193968e8ef15b12d984b975eec66a803;hp=acbf198bb5027824e3fed00e8d8c10a3f01c7f96;hpb=bf1cea46bbcab45b37bb1a27642690bd73996a6e;p=elogind.git

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index acbf198bb..2d4c418e1 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -90,10 +90,9 @@ KERNEL=="auer[0-9]*"		NAME="usb/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 
-# fix floppy devices
+# additional floppy devices (no sysfs entries)
 KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
-KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M $root/%k"
-KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G disk $root/%k"
 
 # block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
@@ -122,7 +121,8 @@ KERNEL=="sch*",			GROUP="disk"
 KERNEL=="pt*|npt*",		GROUP="disk"
 KERNEL=="pg*",			GROUP="disk"
 KERNEL=="evms/block_device*",	GROUP="disk"
-KERNEL=="rawctl*|raw[0-9]*",	NAME="raw/%k", GROUP="disk"
+KERNEL=="rawctl*",		NAME="raw/%k", GROUP="disk"
+SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="osst*|nosst*",		NAME="%k", GROUP="disk"
 KERNEL=="iseries/vt*",		NAME="%k", GROUP="disk"
 KERNEL=="iseries/nvt*",		NAME="%k", GROUP="disk"