Added diskless package config and fixed 50-host-classes for testing

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

diff --git a/class/50-host-classes b/class/50-host-classes
index 785bee23926b9500fb70c7ac4e9669380723464d..d2dd87f783b3f33a5a6b85be3d7037cc863c0b3b 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -1,5 +1,5 @@
 #! /bin/bash
 #! /bin/bash

-
+. /usr/lib/fai/subroutines

 # assign classes hosts
 
 # use a list of classes for our demo machine
 # assign classes hosts
 
 # use a list of classes for our demo machine


@@ -18,13 +18,13 @@ case $HOSTNAME in
        echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
     puma)
        echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
        echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
     puma)
        echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;

-    freestation)
-       echo "FAIBASE DHCPC DISKLESS XORG TRISQUEL" ;;
+    freestation*)
+       echo "FAIBASE DHCPC DISKLESS XORG TRISQUEL WORKSTATION" ;;

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

-if ! ifclass DISKLESS; then
-    (ifclass I386 || ifclass AMD64) && echo GRUB_PC
-fi
+
+(ifclass I386 || ifclass AMD64) && ! ifclass DISKLESS && echo GRUB_PC
+

 exit 0
 exit 0