From 4d06c74ea6b5a808a8d9e6708e7ec085750f87d9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 13 Jul 2009 12:06:51 +0200 Subject: [PATCH] only install one dmraid scan job once in the initqueue --- modules.d/90dmraid/61-dmraid.rules | 2 +- modules.d/90dmraid/dmraid.sh | 2 +- modules.d/90dmraid/install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/90dmraid/61-dmraid.rules b/modules.d/90dmraid/61-dmraid.rules index 661335d3..8e80969f 100644 --- 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 66fe4983..fcd75f74 100755 --- 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 3e64a27d..a05d0c93 100755 --- 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"