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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3576cdf11600089c96b1ad3216cefc32517fe906
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jan 17 09:57:10 2011 +0100

    Removing legacy handling for lenny in grub2 handling of lb_binary_iso.

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 23af83c..a6b7d77 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -163,14 +163,7 @@ input_dir=/usr/lib/grub/i386-pc
 
 # build core.img
 core_img=\$(mktemp)
-
-# 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
+grub-mkimage -d \${input_dir} -o \${core_img} -O i386-pc biosdisk iso9660
 
 # build grub_eltorito image
 cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito

-- 
live-build