X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=808aa2504f8cb3ab06cf1df47a946951b9d03168;hb=ee37d990c89bb3bab1b54e3b3fb43e9f79ed039b;hp=34c98e81aa5591b790912bf64a26b1dd84d4f625;hpb=f8e7e925a0eba5b0091354ccf26842bcfda9b84e;p=automated-distro-installer

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 34c98e8..808aa25 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -1,5 +1,8 @@
 #! /bin/bash
 
+# modified from upstream fai example
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
+
 netplan_yaml() {
     # network configuration using ubuntu's netplan.io
     local IFNAME="$1"
@@ -89,16 +92,39 @@ case "$FAI_ACTION" in
         fi
     elif [ -d $target/etc/network/interfaces.d ]; then
         # ifupdown >= 0.7.41 (Debian >= 8, Ubuntu >= 14.04)
-        iface_stanza lo loopback > $target/etc/network/interfaces.d/lo
 
-        if [ -n "$NIC1" -a ! -f $target/etc/NetworkManager/NetworkManager.conf ]; then
-            iface_stanza $NIC1 $METHOD > $target/etc/network/interfaces.d/$NIC1
-        fi
+      if ifclass VM || ifclass BUSTER_LINODE; 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
+iface $NIC1 inet6 auto
+EOF
+      else
+        cat > $target/etc/network/interfaces <<EOF
+# generated by FAI
+auto lo br0
+iface lo inet loopback
+iface $NIC1 inet manual
+# make a bridge by default so we can have bridged vms.
+# Some example I read had stp on, but i don't need stp,
+# and it causes a vm to fail pxe boot, presumably unless
+# you add some delay.
+# http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
+iface br0 inet dhcp
+  bridge_ports $NIC1
+  bridge_stp off
+  bridge_maxwait 0
+EOF
+      fi
     else
-        (
-            iface_stanza lo loopback
-            iface_stanza $NIC1 $METHOD
-        ) > $target/etc/network/interfaces
+      (
+        iface_stanza lo loopback
+        iface_stanza $NIC1 $METHOD
+      ) > $target/etc/network/interfaces
     fi
 
     if ! ifclass DHCPC ; then
@@ -108,6 +134,12 @@ case "$FAI_ACTION" in
         fi
     fi
     ;;
+
+  if ifclass BUSTER_LINODE; then
+    f=/etc/initramfs-tools/initramfs.conf
+    ainsl $f
+    fi
+
 esac
 
 # here fcopy is mostly used, when installing a client for running in a