Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / DEBIAN / 30-interface

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index e249b6746cd3f7d6eb893263a46922a96c761a80..832461cbb7d6a7083d4153bedf85151355f2d971 100755 (executable)
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -3,46 +3,49 @@
 # modified from upstream fai example
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-if ! ifclass STABLE; then
+newnicnames() {
+
+    # determine predictable network names only for stretch and above
+
+    [ $do_init_tasks -eq 0 ] && return
+
+    ver=$($ROOTCMD dpkg-query --showformat='${Version}' --show udev)
+    if dpkg --compare-versions $ver lt 220-7; then
+       return
+    fi
+
+    [ -z $NIC1 ] && return
+
+    fields="ID_NET_NAME_FROM_DATABASE ID_NET_NAME_ONBOARD ID_NET_NAME_SLOT ID_NET_NAME_PATH"
+    for field in $fields; do
+       name=$(udevadm info /sys/class/net/$NIC1 | sed -rn "s/^E: $field=(.+)/\1/p")
+       if [[ $name ]]; then
+           NIC1=$name
+           break
+       fi
+    done
     if ifclass VM; then
-        # older distro still uses eth0
-        if ifclass BELENOS64; then
-            NIC1=eth0
-        else
-            # For a vm, we only get  ID_NET_NAME_MAC from below,
-            # but when it reboots, it uses ID_NET_NAME_SLOT.
-            NIC1=ens3
-        fi
-    else
-        # get persistent interface name. Note, these class conditions
-        # will need to get modified for new oses. testing vm doesn't use
-        # it right now, but other vms do I'm sure.
-        for field in ID_NET_NAME_FROM_DATABASE \
-                         ID_NET_NAME_ONBOARD \
-                         ID_NET_NAME_SLOT \
-                         ID_NET_NAME_PATH \
-                         ID_NET_NAME_MAC; do
-            name=$(udevadm info /sys/class/net/$NIC1 | sed -rn "s/^E: $field=(.+)/\1/p")
-            if [[ $name ]]; then
-                NIC1=$name
-                break
-            fi
-        done
-        if [[ ! $name ]]; then
-            echo "$0: error: could not find systemd predictable network name"
-            exit 1
-        fi
+        NIC1=ens3
+        return
     fi
-fi
+    if [[ ! $name ]]; then
+       echo "$0: error: could not find systemd predictable network name. Using $NIC1."
+    fi
+}
+
+newnicnames
+CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
+if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
 
-if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
-then
     if ifclass VM; then
+
+        # note, this condition would apply to the elif below too,
+        # but I don't specify a static ip in fai, so not bothering
         cat > $target/etc/network/interfaces <<-EOF
-        # generated by FAI
-        auto lo $NIC1
-        iface lo inet loopback
-        iface $NIC1 inet dhcp
+       # generated by FAI
+       auto lo $NIC1
+       iface lo inet loopback
+       iface $NIC1 inet dhcp
 EOF
     else
         cat > $target/etc/network/interfaces <<-EOF
@@ -61,17 +64,14 @@ EOF
           bridge_maxwait 0
 EOF
     fi
-elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
-then
-    [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
-        # generated by FAI
-        auto lo $NIC1
-        iface lo inet loopback
-        iface $NIC1 inet static
-          address $IPADDR
-          netmask $NETMASK
-          broadcast $BROADCAST
-          gateway $GATEWAYS
+elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
+    [ -n "$CIDR" ] && cat > $target/etc/network/interfaces <<-EOF
+       # generated by FAI
+       auto lo $NIC1
+       iface lo inet loopback
+       iface $NIC1 inet static
+         address $CIDR
+         gateway $GATEWAYS
 EOF
     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
     if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then