]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
iscsi/parse-iscsiroot.sh: correct handling if netroot isn't set
authorHarald Hoyer <harald@redhat.com>
Thu, 17 Sep 2015 13:41:12 +0000 (15:41 +0200)
committerHarald Hoyer <harald@redhat.com>
Wed, 11 Nov 2015 15:46:54 +0000 (16:46 +0100)
corrects bfe65f913a4bc6bc5fdb7aa75234c229a2ceef8f

(cherry picked from commit 7fd112f20e63def6d274ab445b5eb82138348901)

modules.d/95iscsi/parse-iscsiroot.sh

index 63a822f54767f97dc9e7c1b28d6ab92ba17bdd9a..971bab2cb2976ef317a9baad2077a9d9d62e3717 100755 (executable)
@@ -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"