network/ifup: do DHCP for BOOTDEV

(cherry picked from commit 7316d68353)

modules.d/40network/ifup.sh

@@ -407,11 +407,20 @@ fi
 
 # no ip option directed at our interface?
 if [ ! -e /tmp/net.${netif}.up ]; then
-    if getargs 'ip=dhcp6'; then
+    if [ -e /tmp/net.bootdev ]; then
-        load_ipv6
+        BOOTDEV=$(cat /tmp/net.bootdev)
-        do_dhcp -6
+        if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then
-    elif getargs 'ip=dhcp'; then
+            load_ipv6
-        do_dhcp -4
+            do_dhcp
+        fi
+    else
+        if getargs 'ip=dhcp6'; then
+            load_ipv6
+            do_dhcp -6
+        fi
+        if getargs 'ip=dhcp'; then
+            do_dhcp -4
+        fi
     fi
 fi