From: Harald Hoyer <harald@redhat.com>
Date: Tue, 29 May 2012 14:34:58 +0000 (+0200)
Subject: network/ifup.sh: do not default to dhcp, for interfaces without ip=...
X-Git-Tag: 020~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede0532c580fdbace548511b07857fb2e004b299;p=thirdparty%2Fdracut.git

network/ifup.sh: do not default to dhcp, for interfaces without ip=...

Don't try to be smarter than the admin configuring the machine.
Does also conflict with other methods trying to setup the interfaces,
like cmsifup.sh from the cms module.
---

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index c9516bb3d..f7859687f 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -213,17 +213,6 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
     ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)"
 fi
 
-# No ip lines default to dhcp
-ip=$(getarg ip)
-
-if [ -z "$ip" ]; then
-    if [ "$netroot" = "dhcp6" ]; then
-        do_dhcp -6
-    else
-        do_dhcp -4
-    fi
-fi
-
 # Specific configuration, spin through the kernel command line
 # looking for ip= lines
 for p in $(getargs ip=); do