Merge branch 'master' of vcs.fsf.org:fai-configs

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

diff --git a/class/50-host-classes b/class/50-host-classes
index 2425ad7c7d7269155b983cf4cc926fb195549e78..f149d5f819b8242e8f3f757c056f79ff57a7fdc3 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)


@@ -26,6 +27,9 @@ case $HOSTNAME in
     freestation04)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
         nogrub=1 ;;
     freestation04)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
         nogrub=1 ;;

+    freestation06)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
+        nogrub=1 ;;

     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;


@@ -37,10 +41,23 @@ case $HOSTNAME in
        nogrub=1
        ;;
     jobserver*)
        nogrub=1
        ;;
     jobserver*)

-        echo "FAIBASE  SYSADMIN VM"
+        echo "FAIBASE JOB SYSADMIN VM"

         nogrub=1
         ;;
         nogrub=1
         ;;

+    mysqlserver*)
+        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
+        nogrub=1
+        ;;
+    streamstation*)
+        echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"
+        ;;
+    freetop*)
+        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        ;;
+

     *)  
     *)  

+
+

         echo "FAIBASE DHCPC DEMO XORG GNOME";;
 esac
 
         echo "FAIBASE DHCPC DEMO XORG GNOME";;
 esac