fix stretch, upgrade from jessie broke

[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 6f2251a1452ed9938cb468ca62e7099b22651988..a962049c11120b3cc7f96cffcc74ef636a5351d2 100755 (executable)
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -3,24 +3,30 @@
 # modified from upstream fai example
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-if ! ifclass VM && ! ifclass STABLE; then
-    # 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
+if ! ifclass STABLE; then
+    if ifclass VM; then
+        # For a vm, we only get  ID_NET_NAME_MAC from below,
+        # but when it reboots, it uses ID_NET_NAME_SLOT.
+        NIC1=ens3
+    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
-    done
-    if [[ ! $name ]]; then
-        echo "$0: error: could not find systemd predictable network name"
-        exit 1
     fi
 fi