fix host-classes to always work outside pxe boot

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..5e08dd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fai/config/class/51-multi-boot

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index ef7023955b8a891bf13b75a1460ead6ea8706a6b..7b23f85a27d82f735f0521d518a24c2a37b0132d 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,29 +6,34 @@
 [ "$flag_menu" ] && exit 0
 
 # use a list of classes for our demo machine
+echo "FAIBASE DEBIAN"
 case $HOSTNAME in
     demohost)
-        echo "FAIBASE DEBIAN DESKTOP" ;;
-    x2)
-        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
-    tp)
-        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
-    frodo)
-        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
-    treetowl)
-        echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
+        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
+        fi
+        ;;
     lj)
-        echo "FAIBASE DEBIAN LINODESTABLE PARTITION_PROMPT" ;;
+        echo "LINODESTABLE PARTITION_PROMPT" ;;
     li)
-        echo "FAIBASE DEBIAN LINODESTABLE PARTITION_PROMPT" ;;
+        echo "LINODESTABLE PARTITION_PROMPT" ;;
     do)
-        echo "FAIBASE DEBIAN STABLE PARTITION_PROMPT" ;;
+        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
@@ -41,7 +46,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