From: Harald Hoyer <harald@redhat.com>
Date: Tue, 25 Aug 2015 09:37:16 +0000 (+0200)
Subject: network/ifup.sh: only use dhcp on unknown interfaces for ip=dhcp
X-Git-Tag: 044~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=686f9675dfb30f492723b8629e05f284054f2acb;p=thirdparty%2Fdracut.git

network/ifup.sh: only use dhcp on unknown interfaces for ip=dhcp

(cherry picked from commit 7c24815034241e490422691b5f18671c4b9812a9)
---

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index dd47e4bd6..b83d7e728 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -410,7 +410,7 @@ if [ ! -e /tmp/net.${netif}.up ]; then
     if getargs 'ip=dhcp6'; then
         load_ipv6
         do_dhcp -6
-    else
+    elif getargs 'ip=dhcp'; then
         do_dhcp -4
     fi
 fi