X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=465a64f51668bf853d3c148cbd1c43172c2c2967;hb=4029016168015c3aa0accc909c3cff28cf87b929;hp=278bcce785df60383646fa068bbbd1281b26d2b7;hpb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 278bcce..465a64f 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -34,12 +34,14 @@
 #
 # 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
+# STABLE, 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_STABLE, VOL_STABLE_BOOTSTRAP, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS
+# Using VOL_STABLE_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.
+# XENIAL_FREE (no XENIAL_NONFREE setup yet), BELENOS, FLIDAS, STABLE_LINODE.
 # This is a little redundant in some cases, but it keeps things
 # simpler.
 #
@@ -63,26 +65,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"
+        case $HOSTNAME in
+            li|lj) echo "STABLE_LINODE" ;;
+            *)
+                # nonfree repo is not going away any time soon due to
+                # gcc-doc being in nonfree
+                echo "STABLE_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
-    frodo|treetowl)
-        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-            echo "STABLE_NONFREE"
-        fi
-        ;;
-    lj|lj)
-        echo "STABLE STABLE_LINODE" ;;
-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.