Shawn Dunn
4698529be5
OBS-URL: https://build.opensuse.org/request/show/222207 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=98
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
Index: dracut-036/modules.d/95iscsi/parse-iscsiroot.sh
|
|
===================================================================
|
|
--- dracut-036.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-01-29 08:35:47.000000000 +0100
|
|
+++ dracut-036/modules.d/95iscsi/parse-iscsiroot.sh 2014-02-12 18:11:51.627855039 +0100
|
|
@@ -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
|
|
|