From c3dd68fcf108fc80e0bdcac64d553b1a3727be7a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 7 Mar 2013 14:16:11 +0100 Subject: iscsi: run iscsiroot even if no network configured Also inject finished hooks for every iscsiroot netroot --- modules.d/95iscsi/iscsiroot.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'modules.d/95iscsi/iscsiroot.sh') diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh index 463fa458..aa6c6ece 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -53,6 +53,8 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then done iscsistart -b $iscsi_param + echo 'started' > "/tmp/iscsistarted-iscsi" + echo 'started' > "/tmp/iscsistarted-firmware" exit 0 fi @@ -146,9 +148,6 @@ handle_netroot() echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh fi - # inject new exit_if_exists - echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm "$job"' > $hookdir/initqueue/iscsi-settle.sh - # force udevsettle to break > $hookdir/initqueue/work @@ -163,6 +162,10 @@ handle_netroot() ${iscsi_netdev_name+--param iface.net_ifacename=$iscsi_netdev_name} \ ${iscsi_param} \ || : + + netroot_enc=$(str_replace "$1" '/' '\2f') + echo 'started' > "/tmp/iscsistarted-iscsi:${netroot_enc}" + } # loop over all netroot parameter -- cgit v1.2.3