diff options
| author | Harald Hoyer <harald@redhat.com> | 2011-04-12 08:43:10 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2011-04-12 08:45:31 +0200 |
| commit | 2a9b703903afac6fb9075de06ddc009b286d9061 (patch) | |
| tree | 438bb457de1eb877170ce6f0e9e0627157874288 /modules.d | |
| parent | 65e0dd452cf4236c878fdf7c9dd1f6ad4c71d7f1 (diff) | |
| download | dracut-2a9b703903afac6fb9075de06ddc009b286d9061.tar.gz dracut-2a9b703903afac6fb9075de06ddc009b286d9061.tar.bz2 dracut-2a9b703903afac6fb9075de06ddc009b286d9061.zip | |
set udev property hookdir
Revert "mdraid/65-md-incremental-imsm.rules: s#$hookdir#/lib/dracut/hooks/"
This reverts commit e1f68dc6a0c987e27b992d393c1d3e54ca0783a8.
Diffstat (limited to 'modules.d')
| -rw-r--r-- | modules.d/90mdraid/65-md-incremental-imsm.rules | 8 | ||||
| -rwxr-xr-x | modules.d/99base/init | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules index 47110d18..521a7e11 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 201b3e23..740085a7 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 |