X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=adb878913476b9fe09bfdda7fd0e82c22418d817;hp=9aa05cc16d22b01a6dd0426cf43d934f1be887ca;hb=05e47f6734e5a9354a3243686ae55fe4ab2b72c7;hpb=a030c6b0d89340212d3c04023dcd1fe2a52d31d1

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 9aa05cc..adb8789 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,28 +12,38 @@
 # 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 STABLE VOL_STABLE STABLE_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:
-# 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
-# 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 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
+# 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.
+#
+# 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:
 #
+# 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.
@@ -61,19 +59,39 @@
 # 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
         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
@@ -81,10 +99,9 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then
     fi
 fi
 
-# use a list of classes for our demo machine
 echo "FAIBASE"
 
-#echo "PARTITION_PROMPT"
+echo "PARTITION_PROMPT"
 #echo REPARTITION