change stable to stretch, makes more sense

[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 b8226de1f1f527ef29437d79d4053a4380149895..74dd0c37c75a1ac5f9c1851f321240ff96bafb45 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -19,38 +19,75 @@
 
 
 # For multi-boot system.
-# Check that we aren't in a pxe boot environment.
+# We check that we aren't in a pxe boot environment.
 # There is probably a better way to do this.
 # 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),
-# or UBUNTU + XENIAL64.
-#
-# It's shell looks like this:
+# 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 ;;
+#         tp) DEBIAN STRETCH VOL_STRETCH STRETCH_FREE;;
 #         # add more multi-boot hostnames here
 #     esac
 # fi
 #
-if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-    echo "STABLE"
+# Each host defines the base distro: UBUNTU or DEBIAN.
+# the disto version, also the basefile name if we aren't installing debian stable:
+# 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
+# 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,
+# 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.
+#
+#
+# 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.
+#
+#
+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 "STRETCH"
+        case $HOSTNAME in
+            li|lj) echo "STRETCH_LINODE" ;;
+            *)
+                # nonfree repo is not going away any time soon due to
+                # gcc-doc being in nonfree
+                echo "STRETCH_NONFREE"
+                ;;
+        esac
+    elif isdebian-testing; then
+        echo "TESTING_NONFREE"
+    fi
 fi
 
-# use a list of classes for our demo machine
-echo "FAIBASE PARTITION_PROMPT"
-case $HOSTNAME in
-    x2|frodo|treetowl)
-        echo "DEBIAN_NON_FREE"
-        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-            echo "STABLE_NON_FREE"
-        fi
-        ;;
-    lj|lj)
-        echo "LINODESTABLE" ;;
-esac
+echo "FAIBASE"
+
+echo "PARTITION_PROMPT"
+#echo REPARTITION
+
 
 if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then
     # if our eth0 mac is in the kvm range, we are a vm.