X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=f23d1eaf62a5d0e6ccd317fc8df9ed6290bd04a6;hb=d4f7a9349a08f60957ca544f3d68a9b97015f6b9;hp=74c3058bbdcbdd134f25d669d9385dbea564e419;hpb=ed3681256885d295f39d5df60784d3281a2f8719;p=automated-distro-installer

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 74c3058..f23d1ea 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -93,7 +93,7 @@ case "$FAI_ACTION" in
     elif [ -d $target/etc/network/interfaces.d ]; then
         # ifupdown >= 0.7.41 (Debian >= 8, Ubuntu >= 14.04)
 
-      if ifclass VM || ifclass LINODE; 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
@@ -104,6 +104,18 @@ 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
@@ -124,8 +136,8 @@ EOF
       fi
 
       if ifclass LINODE; then
-        mkdir -p /etc/initramfs-tools/conf.d
-        cat >/etc/initramfs-tools/conf.d/mine <<EOF
+        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