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 7ac7ddbda069ca5e67da77f2c6cd0c5bab0fbc94..f149d5f819b8242e8f3f757c056f79ff57a7fdc3 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*)
 # 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)
     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 ;;


@@ -45,12 +49,10 @@ case $HOSTNAME in
         nogrub=1
         ;;
     streamstation*)
         nogrub=1
         ;;
     streamstation*)

-        echo "FAIBASE DHCPC SYSADMIN STREAM"
-        nogrub=1
+        echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"

         ;;
     freetop*)
         ;;
     freetop*)

-        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION"
-        nogrub=1
+        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"

         ;;
 
     *)  
         ;;
 
     *)