various fixes mostly for linode

[automated-distro-installer] / fai / config / class / 50-host-classes

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 356b642db16322e285fbac5841483ba89b00f25b..c7091f0b33dd46e123e1d512a677d13128ccdf36 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -23,20 +23,19 @@
 # Debian stable basefile gets built by faisetup and gets used otherwise.
 # With X suffix, means it has gone through the dirinstall process and has eXtra
 # things installed, to speed up installation.
-# STRETCH64, XENIAL64, BELENOS64, FLIDAS64, FLIDAS64BIG
+# STRETCH64, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG, ETIONA64
 #
 # The distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS, VOL_STRETCH_BOOTSTRAP
-# Using VOL_STRETCH_BOOTSTRAP sets up the install to act like a pxe rom if
-# grub sets a specific var.
+# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS,
+# VOL_ETIONA VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up
+# the install to act like a pxe rom if grub sets a specific var.
 #
-# The apt sources files we want,
-# STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, FLIDAS, BELENOS, STRETCH_LINODE.
+# The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
+# BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
+# XENIAL_FREE, FLIDAS, ETIONA, STRETCH_LINODE.
 #
 # It's all a little redundant in some cases, but it keeps things
-# simpler. Belenos is broken right now, planning to remove it once
-# flidas is released and rms has upgraded.
+# simpler.
 #
 #
 # Other notable classes:
@@ -65,26 +64,33 @@
 #
 # RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
 #
+# LINODE: For running a vm on linode, especially one created with fai-cd.
+
+###### begin Template for 51-multi-boot ######
 #
-# Code in 51-multi-boot, with reasonable combinations of above
-# uncommented for easier editing, and runs as a noop until
-# we replace _ with host names.
-if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
+# It has reasonable combinations of above classes.
+# It's a noop until we replace _ with host names.
+
+#!/bin/bash
+if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     case $HOSTNAME in
         # stretch based minimal recovery / bootstraping os:
-        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_NONFREE ;;
+        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;;
         # flidas
         _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
+        # etiona
+        _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
         # stretch
-        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
+        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;;
+        # buster
+        _) echo DEBIAN BUSTER64 VOL_BUSTER BUSTER_FREE ;;
         # testing
-        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_NONFREE ;;
-        # belenos
-        _) echo UBUNTU BELENOS64 VOL_BELENOS BELENOS ;;
+        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_FREE ;;
         # xenial
         _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
     esac
 fi
+###### end Template for 51-multi-boot ######
 
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
     source /a/bin/distro-functions/src/identify-distros
@@ -101,12 +107,10 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then
                 echo "STRETCH_NONFREE"
                 ;;
         esac
-    elif isdebian-testing; then
-        echo "TESTING_NONFREE"
     fi
 fi
 
-echo "STANDARD"
+echo FAIBASE STANDARD
 
 #echo "PARTITION_PROMPT"
 #echo REPARTITION