From: Harald Hoyer <harald@redhat.com>
Date: Fri, 12 Oct 2012 09:54:07 +0000 (+0200)
Subject: network/parse-ip-opts.sh: relax bootdev handling
X-Git-Tag: 024~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7081e9973526e9bc79bd5dbb083891e60eae78c8;p=thirdparty%2Fdracut.git

network/parse-ip-opts.sh: relax bootdev handling
---

diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
index 5637a9a8b..c7dc3ce5c 100755
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.sh
@@ -40,9 +40,10 @@ fi
 unset count
 
 # If needed, check if bootdev= contains anything usable
+BOOTDEV=$(getarg bootdev=)
+
 if [ -n "$NEEDBOOTDEV" ] ; then
-    BOOTDEV=$(getarg bootdev=) || die "Please supply bootdev argument for multiple ip= lines"
-    [ -z "$BOOTDEV" ] && die "Bootdev argument is empty"
+    [ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
 fi
 
 # If ibft is requested, read ibft vals and write ip=XXX cmdline args
@@ -96,9 +97,6 @@ for p in $(getargs ip=); do
         IFACES="$IFACES $dev"
     fi
 
-    # Small optimization for udev rules
-    [ -z "$NEEDBOOTDEV" ] && [ -n "$dev" ] && BOOTDEV=$dev
-
     # Do we need to check for specific options?
     if [ -n "$NEEDDHCP" ] || [ -n "$DHCPORSERVER" ] ; then
         # Correct device? (Empty is ok as well)