summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLuigi Capriotti <l.capriotti@tiscali.it>2011-01-17 09:55:29 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:33 +0100
commit218610081a48f3cbaf2e42441cfe7182f1242fe5 (patch)
treef5bd1ca8265702615cf28e32f785972326abab95 /scripts
parent2ddc0cef5dca72ad5750479cef47492988172ff6 (diff)
downloadlive-build-218610081a48f3cbaf2e42441cfe7182f1242fe5.zip
live-build-218610081a48f3cbaf2e42441cfe7182f1242fe5.tar.gz
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.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary_iso9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index ca460c4..ad7357e 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