X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=b8226de1f1f527ef29437d79d4053a4380149895;hb=2eebb95531424e04797094d622eebdd7ece5b38b;hp=7b23f85a27d82f735f0521d518a24c2a37b0132d;hpb=3b848c7ec9f673b8257fcd6f645d82289b027c9c;p=automated-distro-installer

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 7b23f85..b8226de 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -2,51 +2,54 @@
 
 # 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.
+# 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:
+# 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"
+fi
+
 # use a list of classes for our demo machine
-echo "FAIBASE DEBIAN"
+echo "FAIBASE PARTITION_PROMPT"
 case $HOSTNAME in
-    demohost)
-        echo "DESKTOP" ;;
-    tp|frodo|treetowl|x2)
-        echo "DESKTOP PARTITION_PROMPT"
-        # non-portable way to see that we aren't in a pxe boot environment.
-        if [[ -e /a/bin/fai/fai-wrapper ]]; then
-            # 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.
-            if isdebian-stable; then
-                echo "STABLE"
-            fi
+    x2|frodo|treetowl)
+        echo "DEBIAN_NON_FREE"
+        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
+            echo "STABLE_NON_FREE"
         fi
         ;;
-    lj)
-        echo "LINODESTABLE PARTITION_PROMPT" ;;
-    li)
-        echo "LINODESTABLE PARTITION_PROMPT" ;;
-    do)
-        echo "STABLE PARTITION_PROMPT" ;;
-    # faiserver)
-    #     echo "DEMO FAISERVER" ;;
-    # xfcehost)
-    #     echo "DEMO XORG XFCE LVM";;
-    # gnomehost)
-    #     echo "DEMO XORG GNOME";;
-    # centos)
-    #     echo "FAIBASE CENTOS"   # you may want to add class XORG here
-    #     ifclass I386 && echo CENTOS6_32  # AFAIK there's no 32bit C7
-    #     ifclass AMD64 && echo CENTOS7_64
-    #     exit 0 ;; # CentOS does not use the GRUB class
-    # slchost)
-    #     # Scientific Linux Cern, is very similar to CentOS. SLC should alsways use the class CENTOS
-    #     echo "FAIBASE CENTOS SLC"  # you may want to add class XORG here
-    #     ifclass I386 && echo SLC7_32
-    #     ifclass AMD64 && echo SLC7_64
-    #     exit 0 ;; # CentOS/SLC does not use the GRUB class
-    *)
-        echo "DESKTOP" ;;
+    lj|lj)
+        echo "LINODESTABLE" ;;
 esac
 
 if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then