Adjust stage2{,_eltorito} code in grml-live

diff --git a/debian/changelog b/debian/changelog
index 07c3b40..8c6d875 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-live (0.9.29) unstable; urgency=low
+
+  [ Ulrich Dangel ]
+  * Renamed stage2_eltorito to stage2 to get rid of name mangling
+    problems with fat.
+
+  [ Michael Prokop ]
+  * Adjust stage2{,_eltorito} code in grml-live.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 29 Oct 2009 01:17:59 +0100
+

 grml-live (0.9.28) unstable; urgency=low
 
   * Drop grub from all classes and add grub-pc to GRMLBASE.
 grml-live (0.9.28) unstable; urgency=low
 
   * Drop grub from all classes and add grub-pc to GRMLBASE.

diff --git a/grml-live b/grml-live
index e5d724b..0a3fb39 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
 set -e
 
 # global variables

-GRML_LIVE_VERSION='0.9.28'
+GRML_LIVE_VERSION='0.9.29'

 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"


@@ -756,12 +756,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
          fi
       fi
 
          fi
       fi
 

-      # jump back to grub from bsd4grml:
-      if [ -e "$BUILD_OUTPUT"/boot/grub/stage2 ]; then
-         GRUB_LEGACY=stage2
-      else
-         GRUB_LEGACY=stage2_eltorito
-      fi
+      # jump back to grub from bsd4grml (/boot/grub/stage2):
+      GRUB_LEGACY=stage2
+

       if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
          if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then
             GRUB_VERSION=2
       if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
          if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then
             GRUB_VERSION=2