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 db84395f9d404afb022c378d54d4e4d6d84515b2..f23d1eaf62a5d0e6ccd317fc8df9ed6290bd04a6 100755 (executable)
--- 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,7 +104,7 @@ iface $NIC1 inet dhcp
 iface $NIC1 inet6 auto
 EOF
 
-      elif ifclass LINODE
+      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,