X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=fd8aad4d7f8807b51a7e824bb9bc0e089be9b509;hb=2028560d2467b5bbb3893b00369f123c90ef7282;hp=31f3f9a99d1ee69e9ce67f6fe3f9967dc92ed0d0;hpb=1fe036ae3d279dbd1d60bef38dc42154507892c4;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 31f3f9a..fd8aad4 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -2,18 +2,6 @@
 
 # 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
 
@@ -27,19 +15,21 @@
 # It's code looks like this:
 # if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
 #     case $HOSTNAME in
-#         tp) DEBIAN STABLE VOL_STABLE STABLE_FREE;;
+#         tp) DEBIAN STRETCH VOL_STRETCH STRETCH_FREE;;
 #         # add more multi-boot hostnames here
 #     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:
-# STABLE, STRETCH64, XENIAL64, BELANOS64
+# STRETCH64, XENIAL64, BELENOS64, FLIDAS64
 # the distro subvol name, we can add as many of these as we want:
-# VOL_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELANOS
+# 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,
-# STABLE_FREE, STABLE_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELANOS, STABLE_LINODE.
+# 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.
 #
@@ -63,31 +53,29 @@
 #
 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 "STABLE"
+        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"
 
-#echo "PARTITION_PROMPT"
+echo "PARTITION_PROMPT"
 #echo REPARTITION
 
-case $HOSTNAME in
-    lj|lj) echo "STABLE STABLE_LINODE" ;;
-    *)
-        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian; then
-            if isdebian-stable; then
-                # nonfree repo is not going away any time soon due to
-                # gcc-doc being in nonfree
-                echo "STABLE_NONFREE"
-            elif isdebian-testing; then
-                echo "TESTING_NONFREE"
-            fi
-        fi
-        ;;
-esac
 
 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.