etiona fixes

[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 5955f7b3b9bdf76efa4ec398f288bac79f398eb1..f23d1eaf62a5d0e6ccd317fc8df9ed6290bd04a6 100755 (executable)
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -69,10 +69,6 @@ newnicnames() {
            break
        fi
     done
-    # This condition is only needed because the nfsroot I use
-    # is based on Jessie, which has an old udev which can't
-    # figure out the persistent interface name used in stretch.
-    if ifclass VM; then NIC1=ens3; return; fi
     if [[ ! $name ]]; then
        echo "$0: error: could not find systemd predictable network name. Using $NIC1."
     fi
@@ -101,28 +97,55 @@ case "$FAI_ACTION" in
         # 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
+iface $NIC1 inet6 auto
 EOF
+
+      elif ifclass LINODE; then
+           # NIC1 is wrong, probably because the installer distro
+           # is stretch and the installed one is buster.
+           # todo: after upgrading installer to buster,
+           # try removing this condition
+        cat > $target/etc/network/interfaces <<EOF
+# generated by FAI
+auto lo $linode_if
+iface lo inet loopback
+iface $linode_if inet dhcp
+iface $linode_if 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
+        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
+
+      if ifclass LINODE; then
+        mkdir -p $target/etc/initramfs-tools/conf.d
+        cat >$target/etc/initramfs-tools/conf.d/mine <<EOF
+# dhcp in initramfs doesn't work on linode. i dunno why, whatever.
+# man 5 initramfs.conf
+# /usr/share/doc/klibc-utils/README.ipconfig.gz
+# /usr/share/initramfs-tools/scripts/functions
+IP=$linode_ip::$linode_gw:255.255.255.0::$linode_if:off
+EOF
+      fi
+
     else
       (
         iface_stanza lo loopback
@@ -137,6 +160,7 @@ EOF
         fi
     fi
     ;;
+
 esac
 
 # here fcopy is mostly used, when installing a client for running in a