various fixes and improvements

[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 c6ac9fcbd7c21ad5b96d344dc837a6314407de87..3169fd3299c76d62996754b0630f2679e5a70505 100755 (executable)
--- 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
 
@@ -27,23 +15,32 @@
 # It's code looks like this:
 # if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
 #     case $HOSTNAME in
-#         tp) DEBIAN STABLE VOL_STABLE STABLE_FREE;;
+#         tp) DEBIAN STRETCH VOL_STRETCH STRETCH_FREE;;
 #         # add more multi-boot hostnames here
 #     esac
 # fi
 #
-# Each host defines the base distro: UBUNTU or DEBIAN.
-# the disto version, also the basefile name if we aren't installing debian stable:
-# STABLE, STRETCH64, XENIAL64, BELANOS64
-# the distro subvol name, we can add as many of these as we want:
-# VOL_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELANOS
-# Using VOL_STABLE_BOOTSTRAP sets up the install to act like a pxe rom if
+#
+# Each host defines following:
+# The base distro:
+# UBUNTU, DEBIAN
+#
+# 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, 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,
-# STABLE_FREE, STABLE_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELANOS, STABLE_LINODE.
-# This is a little redundant in some cases, but it keeps things
-# simpler.
+#
+# The apt sources files we want,
+# STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
+# 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.
 #
 #
 # Other notable classes:
@@ -69,13 +66,13 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then
         echo "DEBIAN"
     fi
     if isdebian-stable; then
-        echo "STABLE"
+        echo "STRETCH"
         case $HOSTNAME in
-            li|lj) echo "STABLE_LINODE" ;;
+            li|lj) echo "STRETCH_LINODE" ;;
             *)
                 # nonfree repo is not going away any time soon due to
                 # gcc-doc being in nonfree
-                echo "STABLE_NONFREE"
+                echo "STRETCH_NONFREE"
                 ;;
         esac
     elif isdebian-testing; then