[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.11-1-10-g2710604

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 2710604f30cd4a162a3998c17a563fdead8ee81e
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jan 17 10:01:25 2011 +0100

    Simplyfing grub-mkimage legacy handling for lenny in lb_binary_iso.

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index ad7357e..007c5b5 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -156,6 +156,18 @@ fi
 if [ "${LB_BOOTLOADER}" = "grub2" ]
 then
 
+	case "${LB_DISTRIBUTION}" in
+		lenny)
+			GRUB_MKIMAGE_OPTIONS=""
+			;;
+
+		*)
+			# grub >= 1.98+20100527 requires -O, see #584415
+			GRUB_MKIMAGE_OPTIONS="-O i386-pc"
+			;;
+
+	esac
+
 cat > binary.sh << EOF
 #!/bin/sh
 
@@ -163,14 +175,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} ${GRUB_MKIMAGE_OPTIONS} biosdisk iso9660
 
 # build grub_eltorito image
 cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito

-- 
live-build