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