X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=ed1d3522a32f2822fd629a8ca650da895215ed65;hb=0d7f79362d601b278236cd1c533c7333e342b54a;hp=b9cc75bfb20eff5b4ce1ca2cb82ed6a57018901b;hpb=34839ddd0fbddfe203a3aa5b3387186a273e31df;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index b9cc75b..ed1d352 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -23,7 +23,7 @@
 # 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
+# STRETCH64, XENIAL64, BELENOS64, FLIDAS64, FLIDAS64BIG
 #
 # 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
@@ -66,13 +66,17 @@
 # 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
+
+###### begin Template for 51-multi-boot ######
+#
+# It has reasonable combinations of above classes.
+# It's a noop until we replace _ with host names.
+
+#!/bin/bash
+if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     case $HOSTNAME in
         # stretch based minimal recovery / bootstraping os:
-        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_NONFREE ;;
+        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;;
         # flidas
         _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
         # stretch
@@ -85,6 +89,7 @@ if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
         _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
     esac
 fi
+###### end Template for 51-multi-boot ######
 
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
     source /a/bin/distro-functions/src/identify-distros
@@ -106,9 +111,9 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then
     fi
 fi
 
-echo "FAIBASE"
+echo "STANDARD"
 
-echo "PARTITION_PROMPT"
+#echo "PARTITION_PROMPT"
 #echo REPARTITION