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 6f3f8a885f729c9580d9aa49a3b59ce2bd05bd5b..12349be3c298ae578213f97def5256207f54903c 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -24,9 +24,25 @@
 # 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. Each host needs
-# to have a class of either DEBIAN + STABLE or STRETCH64,
+# to have a class of either DEBIAN + (STABLE or STRETCH64 or STABLE_BOOTSTRAP),
 # or UBUNTU + XENIAL64.
 #
+# Other notable classes:
+#
+# 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.
+#
+# PARTITION_PROMPT: If we don't see partitions to reuuse, prompt
+# to make sure we really want to repartition and use a completely
+# fresh install. I use this in case our repartition check has
+# a bug in it, or I accidentally set REPARTITION.
+#
+# ROTATIONAL: in a system with ssd and hdd, install to the hdd
+# instead of the default ssd.
+#
+# RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
+#
 # It's shell looks like this:
 # if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
 #     case $HOSTNAME in
@@ -35,14 +51,17 @@
 #     esac
 # fi
 #
-if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-    echo "STABLE"
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+    source /a/bin/distro-functions/src/identify-distros
+    if isdebian-stable; then
+        echo "STABLE"
+    fi
 fi
 
 # use a list of classes for our demo machine
 echo "FAIBASE PARTITION_PROMPT"
 case $HOSTNAME in
-    x2|frodo|treetowl)
+    frodo|treetowl)
         echo "DEBIAN_NON_FREE"
         if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
             echo "STABLE_NON_FREE"