From 55817d44cd85733072d61e20ed6c790f8252b00f Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Tue, 27 May 2014 13:30:17 +0200 Subject: [PATCH] 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 --- modules.d/95iscsi/parse-iscsiroot.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh index 9651a20..3a572f7 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -61,10 +61,10 @@ fi # iscsi_firmware does not need argument checking if [ -n "$iscsi_firmware" ] ; then - netroot=${netroot:-iscsi:} + [ -z "$netroot" ] && netroot=iscsi: modprobe -q iscsi_boot_sysfs 2>/dev/null modprobe -q iscsi_ibft - initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" + initqueue --onetime --timeout /sbin/iscsiroot dummy "$netroot" "$NEWROOT" fi # If it's not iscsi we don't continue @@ -88,7 +88,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 -- 1.8.4.5