From: Harald Hoyer <harald@redhat.com>
Date: Tue, 12 Apr 2011 06:43:10 +0000 (+0200)
Subject: set udev property hookdir
X-Git-Tag: 011~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a9b703903afac6fb9075de06ddc009b286d9061;p=thirdparty%2Fdracut.git

set udev property hookdir

Revert "mdraid/65-md-incremental-imsm.rules: s#$hookdir#/lib/dracut/hooks/"

This reverts commit e1f68dc6a0c987e27b992d393c1d3e54ca0783a8.
---

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 47110d189..521a7e11a 100644
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -28,7 +28,7 @@ LABEL="do_md_inc"
 # 
 ENV{rd_MDADMCONF}!="?*", GOTO="md_auto_end"
 
-RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh /lib/dracut/hooks/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto'"
+RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto'"
 
 GOTO="md_inc_end"
 
@@ -39,7 +39,7 @@ LABEL="md_auto_end"
 #
 RUN+="/sbin/mdadm -I $env{DEVNAME}"
 
-RUN+="/bin/ln -s /sbin/md_finished.sh /lib/dracut/hooks/initqueue/finished/md_finished.sh"
+RUN+="/bin/ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh"
 
 LABEL="md_inc_end"
 
@@ -61,7 +61,7 @@ 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 /lib/dracut/hooks/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdraid_start'"
+RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh $hookdir/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique /sbin/mdraid_start'"
 
 LABEL="end_raidstart"
 
@@ -80,6 +80,6 @@ GOTO="end_container"
 
 LABEL="do_container"
 
-RUN+="/bin/sh -c 'ln -s /sbin/md_finished.sh /lib/dracut/hooks/initqueue/finished/md_finished.sh;/sbin/initqueue --settled --onetime --unique --name mdcontainer_start-%k /sbin/mdcontainer_start $env{DEVNAME}'"
+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}'"
 
 LABEL="end_container"
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 201b3e23d..740085a73 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -184,8 +184,9 @@ if [ $UDEVVERSION -lt 140 ]; then
     UDEV_QUEUE_EMPTY="udevadm settle --timeout=1"
 fi
 
-getargbool 0 rd.udev.info -y rdudevinfo && udevadm control $UDEV_LOG_PRIO_ARG=info
-getargbool 0 rd.udev.debug -y rdudevdebug && udevadm control $UDEV_LOG_PRIO_ARG=debug
+getargbool 0 rd.udev.info -y rdudevinfo && udevproperty "$UDEV_LOG_PRIO_ARG=info"
+getargbool 0 rd.udev.debug -y rdudevdebug && udevproperty "$UDEV_LOG_PRIO_ARG=debug"
+udevproperty "hookdir=$hookdir"
 
 getarg 'rd.break=pre-trigger' 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger"
 source_hook pre-trigger