From af3c6eb8a04c2e526061f1dc82a94f01408bb415 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 7 Apr 2014 16:28:34 +0200 Subject: [PATCH] 95iscsi: Fix iSCSI firmware path Signed-off-by: Hannes Reinecke --- 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