fix stretch, upgrade from jessie broke

[automated-distro-installer] / fai / config / class / 50-host-classes

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index b623f8893ee62fb47152726a1a18d8db1b92b72b..6f32a08cdef0ce4ee85106dbbff4ebc052f368ae 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -17,62 +17,38 @@
 # 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 STABLE or STRETCH64.
+#
+# It's shell looks like this:
+# if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
+#     case $HOSTNAME in
+#         tp) 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 DEBIAN PARTITION_PROMPT"
 case $HOSTNAME in
-    demohost)
-        echo "DESKTOP" ;;
-    tp)
-        echo "DESKTOP PARTITION_PROMPT"
-        # 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.
-        # It's shell looks like this:
-        # if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
-        #     case $HOSTNAME in
-        #         tp) : ;;
-        #         # add more multi-boot hostnames here
-        #     esac
-        # fi
-        #
-        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-            echo "STABLE"
-        fi
-        ;;
     x2|frodo|treetowl)
         echo "NON_FREE"
         if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-            echo "STABLE STABLE_NON_FREE"
+            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