From 5ee6304087c3e9b0cdb3846a5d859477b281d341 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 17 Jan 2011 09:57:10 +0100 Subject: Removing legacy handling for lenny in grub2 handling of lb_binary_iso. --- scripts/build/lb_binary_iso | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index 23af83c33..a6b7d772c 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 -- cgit v1.2.3