update SUSE rules

3 files changed, 7 insertions, 11 deletions

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index 27dbc950c7..acbf198bb5 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -9,12 +9,10 @@ KERNEL=="console",		MODE="600", OPTIONS="last_rule"
 KERNEL=="ptmx",			GROUP="tty", MODE="666", OPTIONS="last_rule"
 
 # serial devices
-KERNEL=="tty[A-Z]*",		GROUP="uucp"
-KERNEL=="pppox*",		GROUP="uucp"
-KERNEL=="ircomm*",		GROUP="uucp"
-KERNEL=="modems/mwave*",	GROUP="uucp"
+KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
 KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="iseries/vtty*",	GROUP="uucp"
+KERNEL=="mwave",		NAME="modems/%k", GROUP="uucp"
 KERNEL=="ttyUSB*", ATTRS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
 KERNEL=="ttyUSB*", ATTRS{product}=="[Hh]andspring*Treo*|[Hh]andspring*Visor*", SYMLINK+="pilot"
 
@@ -57,7 +55,6 @@ KERNEL=="dv1394*",		SYMLINK+="dv1394/%n", GROUP="video"
 KERNEL=="video1394*",		SYMLINK+="video1394/%n", GROUP="video"
 
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
-KERNEL=="mwave",		NAME="modems/%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 
@@ -113,8 +110,7 @@ SUBSYSTEM=="scsi_device", ACTION=="add", ATTRS{type}=="[45]", RUN+="/sbin/modpro
 SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
 SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-
-SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block"
 
 # misc storage devices (non-block)
 KERNEL=="sg*",			GROUP="disk", MODE="640"
diff --git a/etc/udev/suse/60-persistent-storage.rules b/etc/udev/suse/60-persistent-storage.rules
index 1277a1a076..1ac915cc17 100644
--- a/etc/udev/suse/60-persistent-storage.rules
+++ b/etc/udev/suse/60-persistent-storage.rules
@@ -5,10 +5,10 @@ ACTION!="add", GOTO="persistent_storage_end"
 SUBSYSTEM!="block", GOTO="persistent_storage_end"
 
 # skip rules for inappropriate block devices
-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*", GOTO="persistent_storage_end"
+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
 
 # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
-KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
 KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
 
 # for partitions import parent information
diff --git a/etc/udev/suse/64-device-mapper.rules b/etc/udev/suse/64-device-mapper.rules
index c4b7032153..377af786a6 100644
--- a/etc/udev/suse/64-device-mapper.rules
+++ b/etc/udev/suse/64-device-mapper.rules
@@ -1,5 +1,5 @@
-# device mapper links hook into "online" event, when the dm table
-# is available, while some table types must be ignored
+# device mapper links hook into "change" events, when the dm table
+# becomes available; some table-types must be ignored
 
 KERNEL=="device-mapper", SYMLINK+="mapper/control"