projects
/
fai-configs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
00743eb
)
Fixed typo in diskless
author
root
<root@xenhost00.office.fsf.org>
Tue, 19 Aug 2014 04:22:51 +0000
(
00:22
-0400)
committer
root
<root@xenhost00.office.fsf.org>
Tue, 19 Aug 2014 04:22:51 +0000
(
00:22
-0400)
class/50-host-classes
patch
|
blob
|
blame
|
history
diff --git
a/class/50-host-classes
b/class/50-host-classes
index d2dd87f783b3f33a5a6b85be3d7037cc863c0b3b..cd9380da6f2708d1e39323ff0f80fb21a729908a 100755
(executable)
--- a/
class/50-host-classes
+++ b/
class/50-host-classes
@@
-1,30
+1,34
@@
-#! /bin/bash
+#! /bin/bash
. /usr/lib/fai/subroutines
. /usr/lib/fai/subroutines
-# assign classes hosts
+# assign classes hosts
-# use a list of classes for our demo machine
+nogrub=0
+
+# use a list of classes for our demo machine
case $HOSTNAME in
faiserver)
case $HOSTNAME in
faiserver)
- echo "FAIBASE DEMO FAISERVER" ;;
+
echo "FAIBASE DEMO FAISERVER" ;;
demohost)
demohost)
- echo "FAIBASE DHCPC DEMO" ;;
+
echo "FAIBASE DHCPC DEMO" ;;
rms)
rms)
- echo "FAIBASE DHCPC DEMO XORG TRISQUEL RMS";;
+ echo "FAIBASE DHCPC DEMO XORG TRISQUEL RMS";;
gnomehost)
gnomehost)
- echo "FAIBASE DHCPC DEMO XORG GNOME";;
+
echo "FAIBASE DHCPC DEMO XORG GNOME";;
atom*)
atom*)
- echo "FAIBASE DHCPC DEMO" ;;
+
echo "FAIBASE DHCPC DEMO" ;;
bear)
bear)
- echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
+
echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
puma)
puma)
- echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
+
echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
freestation*)
freestation*)
- echo "FAIBASE DHCPC DISKLESS XORG TRISQUEL WORKSTATION" ;;
- *)
- echo "FAIBASE DHCPC DEMO XORG GNOME";;
+ echo "FAIBASE DHCPC DISKLESS XORG TRISQUEL WORKSTATION"
+ nogrub=1 ;;
+ *)
+ echo "FAIBASE DHCPC DEMO XORG GNOME";;
esac
esac
-
-(ifclass I386 || ifclass AMD64) && ! ifclass DISKLESS && echo GRUB_PC
+if [ $nogrub -eq 0 ]; then
+ (ifclass I386 || ifclass AMD64) && echo GRUB_PC
+fi
exit 0
exit 0