[SCM] live-build branch, debian-next, updated. debian/3.0_a11-1-3-g7d3abcb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 7d3abcb22892218b24f8cb197310d8cff8af27cd
Author: Luigi Capriotti <l.capriotti at tiscali.it>
Date:   Mon Jan 17 09:49:01 2011 +0100

    Support for newer grub-common package.
    
    A recent change in grub-common package (#584415) has mandated
    the use of a destination format in calls to grub-mkimage, a
    parameter that was not previously supported.

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index f40eace..23af83c 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -163,7 +163,14 @@ input_dir=/usr/lib/grub/i386-pc
 
 # build core.img
 core_img=\$(mktemp)
-grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
+
+# first version requiring -O is 1.98+20100527, see #584415
+if [ "$(grub-mkimage --help | grep '\-O')" ]
+then
+	grub-mkimage -d \${input_dir} -o \${core_img} -O i386-pc biosdisk iso9660
+else
+	grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
+fi
 
 # build grub_eltorito image
 cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito

-- 
live-build