X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=8ac4a27d7fd7175d9bac221d2e8a0034411904f1;hb=e499b43b888c951fd4c255b2853f0af2350400c4;hp=f8e46de7fbe8560d026bccb7eebf4151a3acb483;hpb=43480add5b3ab6f4e407065454bd6be1d1fe1870;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index f8e46de..8ac4a27 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -2,30 +2,45 @@
 
 # assign classes to hosts based on their hostname
 
-# NOTE:
-# 51-multi-boot should have something like this
-# for transient host configs which are not saved in
-# git (and make it executable):
-
-# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-#     case $HOSTNAME in
-#     frodo) echo STABLE ;;
-#     esac
-# fi
-
-
 # do not use this if a menu will be presented
 [ "$flag_menu" ] && exit 0
 
 
 # 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 STABLE_BOOTSTRAP),
-# or UBUNTU + XENIAL64.
+# 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 STRETCH VOL_STRETCH STRETCH_FREE;;
+#         # add more multi-boot hostnames here
+#     esac
+# fi
+#
+#
+# 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, VOL_STRETCH_BOOTSTRAP
+# Using VOL_STRETCH_BOOTSTRAP sets up the install to act like a pxe rom if
+# grub sets a specific var.
+#
+# The apt sources files we want,
+# STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
+# 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:
 #
@@ -43,30 +58,32 @@
 #
 # 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
-#         tp) DEBIAN STABLE ;;
-#         # add more multi-boot hostnames here
-#     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; 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
-    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.