From 3106869a23e52ce7059ebc63bb45c1b7f4675dd0 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 22 May 2012 00:26:46 +0200
Subject: [PATCH] Use syslinux's mboot.c32 for booting Grub2

This fixes the broken Grub2 boot entry on 64bit systems.

Thanks: Jordan Uggla for his valuable bootloader knowledge
---
 grml-live                                  | 2 +-
 templates/boot/isolinux/addon_10_grub2.cfg | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/grml-live b/grml-live
index f620b9f..d14bbfb 100755
--- a/grml-live
+++ b/grml-live
@@ -880,7 +880,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             copy_addon_file ipxe.lkrn /usr/lib/ipxe addons
             copy_addon_file pci.ids /usr/share/misc addons
             copy_addon_file memtest86+.bin /boot addons
-            for file in memdisk chain.c32 hdt.c32 menu.c32; do
+            for file in memdisk chain.c32 hdt.c32 mboot.c32 menu.c32; do
               copy_addon_file "${file}" /usr/lib/syslinux addons
             done
 
diff --git a/templates/boot/isolinux/addon_10_grub2.cfg b/templates/boot/isolinux/addon_10_grub2.cfg
index cc81c64..40ed59c 100644
--- a/templates/boot/isolinux/addon_10_grub2.cfg
+++ b/templates/boot/isolinux/addon_10_grub2.cfg
@@ -1,7 +1,6 @@
 label grub2
   menu label Run Bootloader Grub^2
-  kernel /boot/addons/bsd4grml/ldbsd.com
-  append echo Loading GRUB...`machine exec grub /boot/grub/grub.img
+  kernel /boot/addons/mboot.c32 /boot/grub/grub.img
 
   text help
                                         Start Bootloader Grub (version 2).
-- 
2.1.4