small bug fixes and improvements

[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 f53475c4f340d6fad9ad8426718c1f452dde6bcd..624077d3529c45b8b802a7f1c5fc9dca31ec32f7 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash -l
 
 # assign classes to hosts based on their hostname
 
@@ -6,21 +6,48 @@
 [ "$flag_menu" ] && exit 0
 
 # use a list of classes for our demo machine
+echo "FAIBASE DEBIAN"
 case $HOSTNAME in
     demohost)
-        echo "FAIBASE DEBIAN DESKTOP STABLE" ;;
-    x2)
-        echo "FAIBASE DEBIAN DESKTOP STABLE" ;;
+        echo "DESKTOP" ;;
     tp)
-        echo "FAIBASE DEBIAN DESKTOP REPARTITION" ;;
-    frodo)
-        echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
+        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"
+        fi
+        ;;
+    lj)
+        echo "LINODESTABLE PARTITION_PROMPT" ;;
+    li)
+        echo "LINODESTABLE PARTITION_PROMPT" ;;
+    do)
+        echo "STABLE PARTITION_PROMPT" ;;
     # faiserver)
-    #     echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
+    #     echo "DEMO FAISERVER" ;;
     # xfcehost)
-    #     echo "FAIBASE DEBIAN DEMO XORG XFCE LVM";;
+    #     echo "DEMO XORG XFCE LVM";;
     # gnomehost)
-    #     echo "FAIBASE DEBIAN DEMO XORG GNOME";;
+    #     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
@@ -33,7 +60,7 @@ case $HOSTNAME in
     #     ifclass AMD64 && echo SLC7_64
     #     exit 0 ;; # CentOS/SLC does not use the GRUB class
     *)
-        echo "FAIBASE DEBIAN DESKTOP" ;;
+        echo "DESKTOP" ;;
 esac
 
 if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then