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 6f32a08cdef0ce4ee85106dbbff4ebc052f368ae..4f776f5ea38466e9c31585feefb66fdee42b375d 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -24,12 +24,24 @@
 # 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 STABLE or STRETCH64.
+# to have a class of either DEBIAN + (STABLE or STRETCH64),
+# 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.
 #
 # It's shell looks like this:
 # if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
 #     case $HOSTNAME in
-#         tp) STABLE ;;
+#         tp) DEBIAN STABLE ;;
 #         # add more multi-boot hostnames here
 #     esac
 # fi
@@ -39,10 +51,10 @@ if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
 fi
 
 # use a list of classes for our demo machine
-echo "FAIBASE DEBIAN PARTITION_PROMPT"
+echo "FAIBASE PARTITION_PROMPT"
 case $HOSTNAME in
-    x2|frodo|treetowl)
-        echo "NON_FREE"
+    frodo|treetowl)
+        echo "DEBIAN_NON_FREE"
         if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
             echo "STABLE_NON_FREE"
         fi