From: Ian Kelling <iank@fsf.org>
Date: Sun, 5 Nov 2017 18:27:15 +0000 (-0500)
Subject: tweaks to make vars more logical
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=e499b43b888c951fd4c255b2853f0af2350400c4;p=automated-distro-installer

tweaks to make vars more logical
---

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index fd8aad4..8ac4a27 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -20,18 +20,26 @@
 #     esac
 # fi
 #
-# Each host defines the base distro: UBUNTU or DEBIAN.
-# the disto version, also the basefile name if we aren't installing debian stable:
+#
+# 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 distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS
+#
+# 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.
-# and the class which defines the apt sources files we want,
+#
+# The apt sources files we want,
 # STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
-#  XENIAL_FREE (no XENIAL_NONFREE setup yet), BELENOS, FLIDAS, STRETCH_LINODE.
-# This is a little redundant in some cases, but it keeps things
-# simpler.
+# 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.
 #
 #
 # Other notable classes:
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index fdcfe6d..ca7b86d 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -199,6 +199,8 @@ if [[ ! $DISTRO ]]; then
         DISTRO=stretch_bootstrap
     elif ifclass VOL_STRETCH; then
         DISTRO=debianstretch
+    elif ifclass VOL_TESTING; then
+        DISTRO=debiantesting
     elif ifclass VOL_XENIAL; then
         DISTRO=ubuntuxenial
     elif ifclass VOL_BELENOS; then