only install one dmraid scan job once in the initqueue

diff --git a/modules.d/90dmraid/61-dmraid.rules b/modules.d/90dmraid/61-dmraid.rules
index 661335d3d2f77a95ae7228d53bb751ea1d07efe4..8e80969f7926262d0eebf86b5f6b1c4ff4910797 100644 (file)
--- a/modules.d/90dmraid/61-dmraid.rules
+++ b/modules.d/90dmraid/61-dmraid.rules
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
 
-ENV{ID_FS_TYPE}=="*_raid_member", RUN+="/sbin/initqueue /sbin/dmraid_scan \$0"
+ENV{ID_FS_TYPE}=="*_raid_member", RUN+="/bin/ln -s /sbin/dmraid_scan /initqueue/dmraid_scan"
 
 LABEL="dm_end"

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index 66fe498399c4212f6c90ebe7af831eb49a5678a5..fcd75f7476349be0eb7fbb135283224ff458f4c3 100755 (executable)
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if udevadm settle --timeout=1 >/dev/null 2>&1; then
+    [ -h "$job" ] && rm -f "$job"
     # run dmraid if udev has settled
     dmraid -ay -Z
-    [ -e "$job" ] && rm -f "$job"
 fi
 

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 3e64a27d902eb3b8d4f0399c0dcfe019da60e602..a05d0c939b5346ad3f78cf80f63d99a593d7eb26 100755 (executable)
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -1,5 +1,5 @@
 #!/bin/bash
-dracut_install dmraid 
+dracut_install dmraid ln
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 inst_rules 64-md-raid.rules
 inst_rules "$moddir/61-dmraid.rules"