[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-6-ged521ee
Andreas B. Mundt
andi at debian.org
Sat Mar 30 08:18:57 UTC 2013
The following commit has been merged in the master branch:
commit 13b98356980dafdbec8a4457402adec967e7ea1d
Author: Andreas B. Mundt <andi at debian.org>
Date: Thu Mar 28 13:40:40 2013 +0100
Remove useless entries from CD menu. Comment on FAI example hosts.
Remove, respectively comment on FAI examples that have not been tested.
They might be confusing and are probably of not much use in a
Debian-LAN setup.
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 9fc492b..fc03abb 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -34,7 +34,7 @@
#FLAVOR="LVM6BAK_A" ## backup disk
#FLAVOR="RAIDLVM7_A RAID" ## RAID1
#FLAVOR="RAIDLVM6BAK_A RAID" ## RAID1, backup disk
-FLAVOR="LVM8_A DISKLESS_SERVER" ## simple diskless, default for testing in a vm
+FLAVOR="LVM8_A DISKLESS_SERVER" ## simple diskless, default for testing in a VM
#FLAVOR="LVM7BAK_A DISKLESS_SERVER" ## diskless, backup disk
#FLAVOR="RAIDLVM8_A RAID DISKLESS_SERVER" ## diskless, RAID1
#FLAVOR="RAIDLVM7BAK_A RAID DISKLESS_SERVER" ## diskless, RAID1, backup disk
@@ -48,34 +48,43 @@ CLIENT_A"
# Use a list of classes for your machine:
case $HOSTNAME in
+## The following hosts are kept for reference only (FAI project).
+## They are not tested and probably do not work with Debian-LAN:
faiserver)
- echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
+ echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
demohost|client*)
- echo "FAIBASE DEBIAN DHCPC DEMO" ;;
+ echo "FAIBASE DEBIAN DHCPC DEMO" ;;
xfcehost)
echo "FAIBASE DEBIAN DHCPC DEMO XORG XFCE" ;;
gnomehost)
- echo "FAIBASE DEBIAN DHCPC DEMO XORG GNOME" ;;
+ echo "FAIBASE DEBIAN DHCPC DEMO XORG GNOME" ;;
atom*)
- echo "FAIBASE DEBIAN DHCPC DEMO" ;;
+ echo "FAIBASE DEBIAN DHCPC DEMO" ;;
bear)
- echo "FAIBASE DEBIAN DHCPC LVM_XEN_SERVER XEN" ;;
+ echo "FAIBASE DEBIAN DHCPC LVM_XEN_SERVER XEN" ;;
puma)
- echo "FAIBASE DEBIAN DHCPC RAID_XEN_VIRTUAL" ;;
+ echo "FAIBASE DEBIAN DHCPC RAID_XEN_VIRTUAL" ;;
+##
+## These hosts are part of the Debian-LAN:
+##
mainserver)
- echo "FAIBASE DEBIAN FAISERVER $MAINSERVER_A" ;;
+ echo "FAIBASE DEBIAN FAISERVER $MAINSERVER_A" ;;
+## For individualizing machines, define the host before the
+## general workstation* case and add a specializing class:
+# workstation00)
+# echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP SPECIAL" ;;
workstation*)
- ## You might want to add some localization class like:
- # echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP GERMAN" ;;
- echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP" ;;
+ ## You might want to add some localization class like:
+ # echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP GERMAN" ;;
+ echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP" ;;
diskless)
- ## You might want to add some localization class like:
+ ## You might want to add some localization class like:
# echo "DEBIAN $WORKSTATION_A XORG DISKLESS_CLIENT GERMAN"
echo "DEBIAN $WORKSTATION_A XORG DISKLESS_CLIENT"
## skip GRUB_PC below:
exit 0 ;;
*)
- echo "FAIBASE DEBIAN DHCPC" ;;
+ echo "FAIBASE DEBIAN DHCPC" ;;
esac
ifclass -o I386 AMD64 && echo GRUB_PC
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
index 09f9634..2eaf369 100644
--- a/fai/config/files/etc/fai/grub.cfg/SERVER_A
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -1,5 +1,5 @@
## grub2 configuration
-set default="Boot OS of first partition on first disk"
+set default=" Boot OS of first partition on first disk"
set timeout=20
if loadfont /boot/grub/ascii.pf2 ; then
@@ -29,73 +29,43 @@ if [ ${iso_path} ] ; then
fi
-menuentry "+------------------------------------------------------+" {
+menuentry "" {
set gfxpayload=1024x768
linux /boot/vmlinuz boot=live
}
-menuentry "| FAI-CD (c) Thomas Lange, lange at debian.org |" {
+menuentry " FAI-CD (c) Thomas Lange, lange at debian.org" {
set gfxpayload=1024x768
linux /boot/vmlinuz boot=live
}
-menuentry "| _VERSIONSTRING_ |" {
+menuentry " _VERSIONSTRING_ " {
set gfxpayload=1024x768
linux /boot/vmlinuz boot=live
}
-menuentry "+------------------------------------------------------+" {
+menuentry "" {
set gfxpayload=1024x768
linux /boot/vmlinuz boot=live
}
-menuentry "Fully Automatic Installation - mainserver" {
+menuentry "" {
set gfxpayload=1024x768
- set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver
- initrd /boot/initrd.img
+ linux /boot/vmlinuz boot=live
}
-menuentry "Fully Automatic Installation - workstation00" {
+menuentry " Fully Automatic Installation - Debian-LAN: mainserver" {
set gfxpayload=1024x768
set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation00
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver
initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - demohost" {
+menuentry " FAI - System Information" {
set gfxpayload=1024x768
set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=demohost
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=mainserver
initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation with XFCE" {
- set gfxpayload=1024x768
- set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=xfcehost
- initrd /boot/initrd.img
-}
-
-menuentry "Fully Automatic Installation with GNOME" {
- set gfxpayload=1024x768
- set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gnomehost
- initrd /boot/initrd.img
-}
-
-menuentry "Fully Automatic Installation - faiserver" {
- set gfxpayload=1024x768
- set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=faiserver
- initrd /boot/initrd.img
-}
-
-menuentry "FAI rescue system, no installation" {
- set gfxpayload=1024x768
- set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
- initrd /boot/initrd.img
-}
-
-menuentry "Boot OS of first partition on first disk" {
+menuentry " Boot OS of first partition on first disk" {
set root=(hd0,1)
chainloader +1
}
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list