update templates/boot/grub/ to grub version 1.98+20100617-1, extend grub.cfg, update...

[grml-live.git] / templates / boot / grub / grub.cfg

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 4602c1a..0cb37b1 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -1,30 +1,45 @@
 ## grub2 configuration
 set default=0
-set timeout=5
+set timeout=20
 
-if font (hd0,1)/boot/grub/ascii.pff ; then
+if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
    set gfxmode=640x480
    insmod gfxterm
    insmod vbe
-   terminal gfxterm
+   terminal_output gfxterm
 fi
 
-if background_image (hd0,1)/boot/grub/grml.png ; then
+if background_image /boot/grub/grml.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 "%GRML_NAME% - release %VERSION% (default)" {
-    linux   /boot/%GRML_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce 
-    initrd  /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
+    initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "Memory test (memtest86+)" {
-    linux   /boot/addons/memtest
+    linux16 /boot/addons/memtest
+}
+
+menuentry "GPXE - boot via network/PXE" {
+    linux16 /boot/addons/gpxe.lkrn
 }
 
 menuentry "Grub - all in one image" {
@@ -56,52 +71,62 @@ menuentry "MirOS bsd4grml (fallback method)" {
 }
 
 menuentry "Boot OS of first partition on first disk" {
+    set root=(hd0,1)
     chainloader +1
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768x16,1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
-menuentry "%GRML_NAME% - copy grml to RAM" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
-    initrd /boot/%GRML_NAME%/initrd.gz
+menuentry "%GRML_NAME% - copy Grml to RAM" {
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram=%GRML_NAME%.squashfs 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=text
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietvideo=ofonly 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - failsafe mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal boot=live noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=text
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - serial mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    set gfxpayload=text
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 # EOF