From: stephen mahood <mv@fsf.org>
Date: Wed, 1 Apr 2015 15:22:21 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:fai-configs
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=8af09394f76f8f9847af61a4fd1e03b536381f35

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

8af09394f76f8f9847af61a4fd1e03b536381f35
diff --cc class/50-host-classes
index 3056ffb,f149d5f..b742c5d
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@@ -24,9 -24,12 +24,12 @@@ case $HOSTNAME i
      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 ;;