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 fbd332316935e616852270eb9a2d07f6e585e1b0..9d310955fe725327f7cd3f3ec4edc4ba0277b9a5 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -7,7 +7,8 @@ nogrub=0
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
     faiserver*)
-       echo "FAIBASE FAISEVER SYSADMIN VM" ;;
+       echo "FAIBASE FAISEVER SYSADMIN VM"
+        nogrub=1 ;;
     demohost)
         echo "FAIBASE DHCPC DEMO" ;;
     rms)
@@ -23,9 +24,12 @@ case $HOSTNAME in
     diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
         nogrub=1 ;;
-    freestation04)
+    freestation7)
         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 ;;
@@ -44,8 +48,15 @@ case $HOSTNAME in
         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";;
+        echo "FAIBASE";;
 esac
 
 if [ $nogrub -eq 0 ]; then