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

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 12349be..465a64f 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -19,13 +19,32 @@
 
 
 # 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 STABLE VOL_STABLE STABLE_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, 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_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), BELENOS, FLIDAS, STABLE_LINODE.
+# This is a little redundant in some cases, but it keeps things
+# simpler.
+#
 #
 # Other notable classes:
 #
@@ -43,33 +62,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 ]]; 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 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.