From: Harald Hoyer <harald@redhat.com>
Date: Thu, 17 Sep 2015 13:41:12 +0000 (+0200)
Subject: iscsi/parse-iscsiroot.sh: correct handling if netroot isn't set
X-Git-Tag: 044~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79cb273dc081598ea0dec4734ee0413491f7c45e;p=thirdparty%2Fdracut.git

iscsi/parse-iscsiroot.sh: correct handling if netroot isn't set

corrects bfe65f913a4bc6bc5fdb7aa75234c229a2ceef8f

(cherry picked from commit 7fd112f20e63def6d274ab445b5eb82138348901)
---

diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 63a822f54..971bab2cb 100755
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -82,7 +82,9 @@ if [ -n "$iscsi_firmware" ]; then
     initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
 fi
 
-[ -z "$netroot" ] || [ "${netroot%%:*}" = "iscsi" ] || return 1
+if [ -z "$netroot" ] || ! [ "${netroot%%:*}" = "iscsi" ]; then
+    return 1
+fi
 
 initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "$netroot" "$NEWROOT"