summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-01-17 09:57:10 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:42 +0100
commit5ee6304087c3e9b0cdb3846a5d859477b281d341 (patch)
treefd197ab73576cc20d5e67203ea093432525a934a
parentc4c316ed4fcd451a862c43216a50b19e460edd03 (diff)
downloadvyos-live-build-5ee6304087c3e9b0cdb3846a5d859477b281d341.tar.gz
vyos-live-build-5ee6304087c3e9b0cdb3846a5d859477b281d341.zip
Removing legacy handling for lenny in grub2 handling of lb_binary_iso.
-rwxr-xr-xscripts/build/lb_binary_iso9
1 files changed, 1 insertions, 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