Shawn Dunn
7955a4d13a
- Update dracut to 037 * Add --hostonly_cmdline switch * Update --mount syntax * Include modules from /updates directory * Fixes for network setup * Some small fixes - Rediff patches - Include iscsiuio again (bnc#872474) Remove: remove-iscsiuio.patch - Install 59-scsi-sg_utils.rules (bnc#872478) Add: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch - Install 67-kpartx-compat.rules (bnc#872662) Add: 0016-90multipath-add-67-kpartx-compat.rules.patch - Install separate multipath service file (bnc#871610) Add: 0017-90multipath-install-dracut-specific-service-file.patch - Do not fsck and mount from fstab if systemd is used (bnc# Add: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch - Fixup initqueue for remote-fs Add: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch OBS-URL: https://build.opensuse.org/request/show/229484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=124
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From af3c6eb8a04c2e526061f1dc82a94f01408bb415 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 7 Apr 2014 16:28:34 +0200
|
|
Subject: [PATCH] 95iscsi: Fix iSCSI firmware path
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95iscsi/parse-iscsiroot.sh | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
index 4be9d56..ec7764e 100755
|
|
--- a/modules.d/95iscsi/parse-iscsiroot.sh
|
|
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
@@ -61,10 +61,9 @@ fi
|
|
|
|
# iscsi_firmware does not need argument checking
|
|
if [ -n "$iscsi_firmware" ] ; then
|
|
- netroot=${netroot:-iscsi:}
|
|
+ netroot=${netroot:-iscsi}
|
|
modprobe -q iscsi_boot_sysfs 2>/dev/null
|
|
modprobe -q iscsi_ibft
|
|
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
|
|
fi
|
|
|
|
# If it's not iscsi we don't continue
|
|
@@ -88,7 +87,7 @@ fi
|
|
|
|
if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then
|
|
if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
|
|
- initqueue --onetime --settled "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
|
|
+ initqueue --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
|
|
fi
|
|
fi
|
|
|
|
--
|
|
1.8.1.4
|
|
|