Dominique Leuenberger
aae67ad4f9
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=139
43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
From 06d95ed6eb72ad9b1a4666b3d7cb6977e5b83ca5 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 21 Mar 2019 16:27:04 +0100
|
|
Subject: [PATCH 1/6] iscsi: don't continue waiting if the root device is
|
|
present
|
|
|
|
dracut waits for every iscsiroot connection to be established
|
|
before switching root. This is not necessary in multipath scenarios,
|
|
where a single path is usually sufficient to set up the root device,
|
|
and where users expect booting to succeed unless all paths are down.
|
|
|
|
Don't wait for the iscsi portal to start if the root device has
|
|
already been found.
|
|
---
|
|
modules.d/95iscsi/parse-iscsiroot.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
index f884e684..b96605ef 100755
|
|
--- a/modules.d/95iscsi/parse-iscsiroot.sh
|
|
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
@@ -84,7 +84,7 @@ if [ -n "$iscsi_firmware" ]; then
|
|
modprobe -b -q iscsi_boot_sysfs 2>/dev/null
|
|
modprobe -b -q iscsi_ibft
|
|
# if no ip= is given, but firmware
|
|
- echo "[ -f '/tmp/iscsistarted-firmware' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
+ echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-firmware' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
|
|
initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
|
|
initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
|
|
@@ -147,7 +147,7 @@ for nroot in $(getargs netroot); do
|
|
type parse_iscsi_root >/dev/null 2>&1 || . /lib/net-lib.sh
|
|
parse_iscsi_root "$nroot" || return 1
|
|
netroot_enc=$(str_replace "$nroot" '/' '\2f')
|
|
- echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
+ echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-$netroot_enc' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
done
|
|
|
|
# Done, all good!
|
|
--
|
|
2.16.4
|
|
|