Blame SOURCES/0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch

712866
From c87d489ca619c719323da446076ab67dc091960d Mon Sep 17 00:00:00 2001
712866
From: Harald Hoyer <harald@redhat.com>
712866
Date: Tue, 6 Sep 2016 15:18:24 +0200
712866
Subject: [PATCH] network/parse-ip-opts: be more liberal to multiple ip=
712866
 options
712866
712866
Do not bail out early.
712866
712866
https://bugzilla.redhat.com/show_bug.cgi?id=1304069
712866
---
712866
 modules.d/40network/parse-ip-opts.sh | 6 +++---
712866
 1 file changed, 3 insertions(+), 3 deletions(-)
712866
712866
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
5c6c2a
index 3c962044..68afe91b 100755
712866
--- a/modules.d/40network/parse-ip-opts.sh
712866
+++ b/modules.d/40network/parse-ip-opts.sh
712866
@@ -38,7 +38,7 @@ unset count
712866
 # If needed, check if bootdev= contains anything usable
712866
 BOOTDEV=$(getarg bootdev=)
712866
 
712866
-if [ -n "$NEEDBOOTDEV" ] && getargbool 1 rd.neednet; then
712866
+if [ -n "$NEEDBOOTDEV" ] && ! getargbool 0 rd.neednet; then
712866
     #[ -z "$BOOTDEV" ] && warn "Please supply bootdev argument for multiple ip= lines"
712866
     echo "rd.neednet=1" > /etc/cmdline.d/dracut-neednet.conf
712866
     info "Multiple ip= arguments: assuming rd.neednet=1"
712866
@@ -79,8 +79,8 @@ for p in $(getargs ip=); do
712866
                 ;;
712866
             auto6);;
712866
             dhcp|dhcp6|on|any) \
712866
-                [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
712866
-                    die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
712866
+                #[ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
712866
+                #    die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
712866
                 [ -n "$ip" ] && \
712866
                     die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoopt'"
712866
                 ;;