From: Harald Hoyer <harald@redhat.com>
Date: Thu, 11 Aug 2011 08:48:00 +0000 (+0200)
Subject: modules.d/90mdraid/65-md-incremental-imsm.rules: fix md_finished install
X-Git-Tag: 012~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=031bf1d0fafaa3fdb7096f2442e580ba05ed9fb3;p=thirdparty%2Fdracut.git

modules.d/90mdraid/65-md-incremental-imsm.rules: fix md_finished install
---

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 2cf999a81..4f2f9c09f 100644
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -28,7 +28,8 @@ LABEL="do_md_inc"
 #
 ENV{rd_MDADMCONF}!="?*", GOTO="md_auto_end"
 
-RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto'"
+RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
+RUN+="/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto"
 
 GOTO="md_inc_end"
 
@@ -39,7 +40,7 @@ LABEL="md_auto_end"
 #
 RUN+="/sbin/mdadm -I $env{DEVNAME}"
 
-RUN+="/bin/ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh"
+RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
 
 LABEL="md_inc_end"
 
@@ -61,7 +62,8 @@ LABEL="do_raidstart"
 # check if array is not inactive anymore
 TEST=="md/array_state", ATTR{md/array_state}!="|inactive", GOTO="end_raidstart"
 
-RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdraid_start'"
+RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
+RUN+="/sbin/initqueue --settled --onetime --unique /sbin/mdraid_start"
 
 LABEL="end_raidstart"
 
@@ -80,6 +82,7 @@ GOTO="end_container"
 
 LABEL="do_container"
 
-RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique --name mdcontainer_start-%k /sbin/mdcontainer_start $env{DEVNAME}'"
+RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
+RUN+="/sbin/initqueue --settled --onetime --unique --name mdcontainer_start-%k /sbin/mdcontainer_start $env{DEVNAME}"
 
 LABEL="end_container"
diff --git a/modules.d/90mdraid/md_finished.sh b/modules.d/90mdraid/md_finished.sh
index a06bc4f7f..cde096608 100755
--- a/modules.d/90mdraid/md_finished.sh
+++ b/modules.d/90mdraid/md_finished.sh
@@ -2,9 +2,8 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 for f in $hookdir/initqueue/settled/mdcontainer_start* $hookdir/initqueue/settled/mdraid_start* $hookdir/initqueue/settled/mdadm_auto*; do
-    [ -e $f ] && return 1
+    [ -e $f ] && exit 1
 done
 
-$UDEV_QUEUE_EMPTY >/dev/null 2>&1 || return 1
-
-return 0
+$UDEV_QUEUE_EMPTY >/dev/null 2>&1 || exit 1
+exit 0