Permalink
Browse files

grub.cfg, Makefile: add missing grub.cfg to package

  • Loading branch information...
1 parent 2bb263c commit 24456fe3c53c6ac73df240643a2f05527d6f7f4a @Mrfai Mrfai committed Jul 28, 2010
Showing with 80 additions and 2 deletions.
  1. +1 −1 Makefile
  2. +77 −0 conf/grub.cfg
  3. +2 −1 debian/changelog
View
@@ -37,7 +37,7 @@ install:
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
View
@@ -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@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
+}
+
View
@@ -1,4 +1,4 @@
-fai (3.4~beta7) 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 (3.4~beta7) unstable; urgency=low
* 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

0 comments on commit 24456fe

Please sign in to comment.