dmraid.rules: cleanup

diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
index 6bcf0529b68cc22759a7c38d7b09628f5d47b8cc..5b9e425b075554362c15bde241d8a08230fe8290 100644 (file)
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
@@ -1,5 +1,5 @@
 # This file causes block devices with RAID (dmraid) signatures to
-# automatically cause dmraid to be run.
+# automatically cause dmraid_scan to be run.
 # See udev(8) for syntax
 
 SUBSYSTEM!="block", GOTO="dm_end"
@@ -7,15 +7,12 @@ ACTION!="add|change", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
 ENV{ID_FS_TYPE}=="isw_raid_member", GOTO="dm_end"
+ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
+TEST=="/tmp/.dmraid_scan-%k", GOTO="dm_end"
 
-ENV{ID_FS_TYPE}=="*_raid_member", \
-    TEST!="/tmp/.dmraid_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
+RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
 
-
-ENV{ID_FS_TYPE}=="*_raid_member", \
-    TEST!="/tmp/.dmraid_scan-%k", \
-    ATTR{partition}!="?*", \
+ATTR{partition}!="?*", \
     RUN+="/sbin/partx -d $env{DEVNAME}"
 
 LABEL="dm_end"

diff --git a/modules.d/90dmraid/61-dmraid.rules b/modules.d/90dmraid/61-dmraid.rules
index 7a5f9af82c92868b28be00d0317407ba622b961f..95fc5141422733cb897b6252a3e98c12c2981994 100644 (file)
--- a/modules.d/90dmraid/61-dmraid.rules
+++ b/modules.d/90dmraid/61-dmraid.rules
@@ -1,19 +1,17 @@
 # This file causes block devices with RAID (dmraid) signatures to
-# automatically cause dmraid to be run.
+# automatically cause dmraid_scan to be run.
 # See udev(8) for syntax
 
 SUBSYSTEM!="block", GOTO="dm_end"
 ACTION!="add|change", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
+ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
+TEST=="/tmp/.dmraid_scan-%k", , GOTO="dm_end"
 
-ENV{ID_FS_TYPE}=="*_raid_member", \
-    TEST!="/tmp/.dmraid_scan-%k", \
-    RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
+RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
 
-ENV{ID_FS_TYPE}=="*_raid_member", \
-    TEST!="/tmp/.dmraid_scan-%k", \
-    ATTR{partition}!="?*", \
+ATTR{partition}!="?*", \
     RUN+="/sbin/partx -d $env{DEVNAME}"
 
 LABEL="dm_end"