[Fai-commit] r6016 - in branches/stable/3.4: . conf debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:42 +0000 (Tue, 17 Aug 2010)
New Revision: 6016

Added:
   branches/stable/3.4/conf/grub.cfg
Modified:
   branches/stable/3.4/Makefile
   branches/stable/3.4/debian/changelog
Log:
grub.cfg, Makefile: add missing grub.cfg to package


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/Makefile
===================================================================
--- branches/stable/3.4/Makefile	2010-08-17 12:56:38 UTC (rev 6015)
+++ branches/stable/3.4/Makefile	2010-08-17 12:56:42 UTC (rev 6016)
@@ -37,7 +37,7 @@
 	install bin/dhclient-fai-script  $(DESTDIR)/etc/dhcp3
 	install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
 	install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
-	install -m644 conf/fai.conf conf/menu.lst conf/live.conf $(DESTDIR)/etc/fai/
+	cd conf ; install -m644 fai.conf menu.lst grub.cfg live.conf $(DESTDIR)/etc/fai/
 	install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
 	install -m644 conf/sources.list $(DESTDIR)/etc/fai/apt/
 	install -m644 conf/NFSROOT $(DESTDIR)/etc/fai

Added: branches/stable/3.4/conf/grub.cfg
===================================================================
--- branches/stable/3.4/conf/grub.cfg	                        (rev 0)
+++ branches/stable/3.4/conf/grub.cfg	2010-08-17 12:56:42 UTC (rev 6016)
@@ -0,0 +1,77 @@
+## grub2 configuration
+set default=4
+set timeout=20
+
+if loadfont /boot/grub/ascii.pf2 ; then
+   insmod png
+   set gfxmode=640x480
+   insmod gfxterm
+   insmod vbe
+   terminal_output gfxterm
+fi
+
+if background_image /boot/grub/fai.png ; then
+  set color_normal=black/black
+  set color_highlight=red/black
+  set menu_color_normal=black/black
+  set menu_color_highlight=black/yellow
+else
+  set menu_color_normal=white/black
+  set menu_color_highlight=black/yellow
+fi
+
+# make sure we can access partitions
+insmod part_msdos
+insmod part_gpt
+
+if [ ${iso_path} ] ; then
+    set loopback="findiso=${iso_path}"
+fi
+
+
+menuentry "+------------------------------------------------------+" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "|    FAI-CD        (c) Thomas Lange, lange at debian.org  |" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "| _VERSIONSTRING_ |" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "+------------------------------------------------------+" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+
+menuentry "Fully Automatic Installation - demohost (pw: installme)" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
+    initrd  /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation with GNOME (pw: installme)" {
+    set gfxpayload=1024x768
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+    initrd /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - faiserver (pw: installme)" {
+    set gfxpayload=1024x768
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0::xxx:off hostname=faiserver
+    initrd /boot/initrd.img
+}
+
+menuentry "FAI rescue system, no installation" {
+    set gfxpayload=1024x768
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
+    initrd /boot/initrd.img
+}
+
+menuentry "Boot OS of first partition on first disk" {
+    set root=(hd0,1)
+    chainloader +1
+}
+

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:38 UTC (rev 6015)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:42 UTC (rev 6016)
@@ -1,4 +1,4 @@
-fai (3.4~beta6) unstable; urgency=low
+fai (3.4~beta8) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -74,6 +74,7 @@
   * fai-guide.txt: add info how to generate the encrypted password
   * control: update to new standards version
   * fai-cd.8: add option -G
+  * grub.cfg, Makefile: add missing grub.cfg to package
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks