cleaned up default host

[fai-configs.git] / class / 50-host-classes

diff --git a/class/50-host-classes b/class/50-host-classes
index 1442ff26c12c20e1868ed30b89c19d9fc6c656d0..b8c409020b46a4f5b97f2117abd34a7b86b02c79 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -6,8 +6,9 @@ nogrub=0
 
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
 
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in

-    faiserver)
-        echo "FAIBASE DEMO FAISERVER" ;;
+    faiserver*)
+       echo "FAIBASE FAISEVER SYSADMIN VM"
+        nogrub=1 ;;

     demohost)
         echo "FAIBASE DHCPC DEMO" ;;
     rms)
     demohost)
         echo "FAIBASE DHCPC DEMO" ;;
     rms)


@@ -22,14 +23,39 @@ case $HOSTNAME in
         echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
     diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
         echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
     diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"

+        nogrub=1 ;;
+    freestation04)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
+        nogrub=1 ;;

     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;
     freetop-x60*)
        echo "FAIBASE DHCPC XORG TRISQUEL WORKSTATION FSF"
        ;;
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;
     freetop-x60*)
        echo "FAIBASE DHCPC XORG TRISQUEL WORKSTATION FSF"
        ;;

+    iwikiserver*)
+       echo "FAIBASE IKIWIKI SYSADMIN VM"
+       nogrub=1
+       ;;
+    jobserver*)
+        echo "FAIBASE JOB SYSADMIN VM"
+        nogrub=1
+        ;;
+    mysqlserver*)
+        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
+        nogrub=1
+        ;;
+    streamstation*)
+        echo "FAIBASE DHCPC SYSADMIN STREAM"
+        nogrub=1
+        ;;
+    freetop*)
+        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION"
+        nogrub=1
+        ;;
+

     *)  
     *)  

-        echo "FAIBASE DHCPC DEMO XORG GNOME";;
+        echo "FAIBASE";;

 esac
 
 if [ $nogrub -eq 0 ]; then
 esac
 
 if [ $nogrub -eq 0 ]; then