Skip to content
Browse files

Adjust stage2{,_eltorito} code in grml-live

  • Loading branch information...
1 parent 2c86fb7 commit f532d104825cdf1e3d077efd09861f7ab6e5339d @mika mika committed Oct 29, 2009
Showing with 15 additions and 7 deletions.
  1. +11 −0 debian/changelog
  2. +4 −7 grml-live
View
11 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.
View
11 grml-live
@@ -23,7 +23,7 @@ fi
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)"
@@ -756,12 +756,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
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

0 comments on commit f532d10

Please sign in to comment.
Something went wrong with that request. Please try again.