various fixes

[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 8ac4a27d7fd7175d9bac221d2e8a0034411904f1..adb878913476b9fe09bfdda7fd0e82c22418d817 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -12,21 +12,18 @@
 # 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
 #
-# The base disto version, which is also the basefile name if it exists:
-# STRETCH64, XENIAL64, BELENOS64, FLIDAS64
+# The base disto version, only use so far is the basefile name if it exists.
+# 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, FLIDAS64X
 #
 # 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
@@ -39,11 +36,14 @@
 #
 # 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.
+# flidas is released and rms has upgraded.
 #
 #
 # Other notable classes:
 #
+# DESKTOP: install a bunch of extra packages. For creating X suffix
+# basefiles. See README.
+#
 # REPARTITION: we try to reuse partitions/filesystems to install a new
 # os into a multi-os system, if we see some basic hueristics, like the
 # right amount of them. This overrides that.
@@ -59,6 +59,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