X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=a6d8bc2afb7bd585d1455756d8f7d9ff5e7a15a9;hb=9ac5bbeccb3e969e29b372656bd51352ff31b0b8;hp=74dd0c37c75a1ac5f9c1851f321240ff96bafb45;hpb=bacafbabe07c9edc86eaa75c24887d6fac0c310a;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 74dd0c3..a6d8bc2 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -2,18 +2,6 @@
 
 # assign classes to hosts based on their hostname
 
-# NOTE:
-# 51-multi-boot should have something like this
-# for transient host configs which are not saved in
-# git (and make it executable):
-
-# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-#     case $HOSTNAME in
-#     frodo) echo STABLE ;;
-#     esac
-# fi
-
-
 # do not use this if a menu will be presented
 [ "$flag_menu" ] && exit 0
 
@@ -24,26 +12,29 @@
 # We check the reverse condition in 51-multi-boot,
 # and set what os we are installing, but don't check it
 # into git since it changes regularly.
-# It's code looks like this:
-# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-#     case $HOSTNAME in
-#         tp) DEBIAN STRETCH VOL_STRETCH STRETCH_FREE;;
-#         # add more multi-boot hostnames here
-#     esac
-# fi
+
+#
+#
+# Each host defines following:
+# The base distro:
+# UBUNTU, DEBIAN
 #
-# Each host defines the base distro: UBUNTU or DEBIAN.
-# the disto version, also the basefile name if we aren't installing debian stable:
+# The base disto version, which is also the basefile name if it exists.
+# Debian stable basefile gets built by faisetup and gets used otherwise,:
 # STRETCH64, XENIAL64, BELENOS64, FLIDAS64
-# the distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS
+#
+# 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.
-# and the class which defines the apt sources files we want,
+#
+# The apt sources files we want,
 # STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
-#  XENIAL_FREE (no XENIAL_NONFREE setup yet), BELENOS, FLIDAS, STRETCH_LINODE.
-# This is a little redundant in some cases, but it keeps things
-# simpler.
+# XENIAL_FREE, FLIDAS, BELENOS, 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.
 #
 #
 # Other notable classes:
@@ -63,6 +54,26 @@
 # RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
 #
 #
+# 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
+    case $HOSTNAME in
+        # stretch based minimal recovery / bootstraping os:
+        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_NONFREE ;;
+        # flidas
+        _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
+        # stretch
+        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
+        # testing
+        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_NONFREE ;;
+        # belenos
+        _) echo UBUNTU BELENOS64 VOL_BELENOS BELENOS ;;
+        # xenial
+        _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
+    esac
+fi
+
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
     source /a/bin/distro-functions/src/identify-distros
     if isdebian; then