templates/boot/isolinux/{addons,syslinux}.cfg: Use new ldbsd.com

diff --git a/debian/changelog b/debian/changelog
index 716a6a4..d49c240 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 grml-live (0.9.26) UNRELEASED; urgency=low
 
+  [ Michael Prokop ]
   * Update templates/boot/grub to grub2 version 1.97~beta4-1.
   * Add templates/boot/isolinux/ifcpu64.c32.
+  * templates/boot/isolinux/{addons,syslinux}.cfg: Use new ldbsd.com
+    feature (command line) to chain into GRUB2 directly from isolinux
+    or syslinux without an intermediate interactive/menu prompt.
+    Thanks to Thorsten for implementing and help.
+
+  [ Thorsten Glaser ]
+  * Update MirOS bsd4grml to 20091024 (ldbsd.com and ldbsd.txt only).
 
- -- Michael Prokop <mika@grml.org>  Sat, 24 Oct 2009 18:33:51 +0200
+ -- Michael Prokop <mika@grml.org>  Sat, 24 Oct 2009 19:01:04 +0200
 
 grml-live (0.9.25) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index 6b20373..ba3ea61 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -761,9 +761,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             GRUB_VERSION=1
          fi
 
-         # why not ed(1)?
          for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
-                     "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg; do
+                     "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
+                     "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg \
+                     "$BUILD_OUTPUT"/boot/grub/menu.lst ; do
              sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
                     -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
          done

diff --git a/templates/boot/isolinux/addons.cfg b/templates/boot/isolinux/addons.cfg
index e297eba..6dde7b8 100644 (file)
--- a/templates/boot/isolinux/addons.cfg
+++ b/templates/boot/isolinux/addons.cfg
@@ -6,15 +6,34 @@ menu label ^Back to main menu...
 menu exit
 menu separator
 
-label grub
-  menu label Run Bootloader ^Grub
+label grub2
+  menu label Run Bootloader Grub2
+  kernel /boot/addons/bsd4grml/ldbsd.com
+  append echo Loading GRUB...`machine exec grub /boot/grub/core.img
+
+  text help
+                                        Start Bootloader Grub (version 2).
+  endtext
+
+label grub1
+  menu label Run Bootloader ^Grub-Legacy (version 1)
+  kernel /boot/addons/bsd4grml/ldbsd.com
+  append echo Loading GRUB...`machine exec grub /boot/grub/%GRUB_LEGACY%
+
+  text help
+                                        Start Bootloader Grub (version 1).
+  endtext
+
+label allinone
+  menu label Run ^All-in-One-Image
   kernel /boot/addons/memdisk
   append initrd=/boot/addons/allinone.img
 
   text help
-                                        Start Bootloader Grub (allinone.img),
-                                        which supports booting from local disks,
-                                        booting via PXE,...
+                                        Start All-in-One-Image, being a special
+                                        version of Grub with an easy to use
+                                        interface for booting from local disks,
+                                        booting via PXE (with gPXE support),...
   endtext
 
 label dos

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index b508be4..977fbf9 100644 (file)
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -115,8 +115,18 @@ MENU LABEL forensic
 KERNEL linux26
 APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live 
 
-LABEL grub
-MENU LABEL grub
+LABEL grub2
+MENU LABEL GRUB2
+KERNEL /boot/addons/bsd4grml/ldbsd.com
+APPEND echo Loading GRUB...`machine exec grub /boot/grub/core.img
+
+LABEL grub1
+MENU LABEL GRUB1
+KERNEL /boot/addons/bsd4grml/ldbsd.com
+APPEND echo Loading GRUB...`machine exec grub /boot/grub/%GRUB_LEGACY%
+
+LABEL allinone
+MENU LABEL All-in-One-Image
 KERNEL /boot/addons/memdisk
 APPEND initrd=/boot/addons/allinone.img