40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
|
commit 7d3142ce831420b957841ebe045f7b0018759d5b
|
||
|
|
Author: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Tue May 27 13:30:17 2014 +0200
|
||
|
|
|
||
|
|
95iscsi: strip one set of quotes when calling initqueue
|
||
|
|
|
||
|
|
initqueue will process the arguments, assuming the first non-option
|
||
|
|
argument to be the program to be executed. Putting the entire
|
||
|
|
commandline into this argument confuses both, initqueue and the
|
||
|
|
program in question.
|
||
|
|
|
||
|
|
References: bnc#879038
|
||
|
|
|
||
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
||
|
|
|
||
|
|
Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh
|
||
|
|
===================================================================
|
||
|
|
--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh
|
||
|
|
+++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh
|
||
|
|
@@ -69,8 +69,8 @@ fi
|
||
|
|
|
||
|
|
# iscsi_firmware does not need argument checking
|
||
|
|
if [ -n "$iscsi_firmware" ] ; then
|
||
|
|
- netroot=${netroot:-iscsi:}
|
||
|
|
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
|
||
|
|
+ [ -z "$netroot" ] && netroot=iscsi:
|
||
|
|
+ initqueue --onetime --timeout /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
|
||
|
|
fi
|
||
|
|
|
||
|
|
# If it's not iscsi we don't continue
|
||
|
|
@@ -94,7 +94,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 --onetime --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|