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

This reverts commit ede0532c580fdbace548511b07857fb2e004b299.

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 245b450e6fe2e20185e832812e6ff9e630775068..31eb9665d323af1a875cf19f153d15e328db5309 100755 (executable)
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -216,6 +216,17 @@ 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