diff options
| author | Luigi Capriotti <l.capriotti@tiscali.it> | 2011-01-17 09:49:01 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:42 +0100 |
| commit | c4c316ed4fcd451a862c43216a50b19e460edd03 (patch) | |
| tree | 1bbf39f75de210ce9041c3555de9ff0c822a6fc0 /scripts/build | |
| parent | 18eeaae6021834d5ec5a51b688bca0f062808932 (diff) | |
| download | vyos-live-build-c4c316ed4fcd451a862c43216a50b19e460edd03.tar.gz vyos-live-build-c4c316ed4fcd451a862c43216a50b19e460edd03.zip | |
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/build')
| -rwxr-xr-x | scripts/build/lb_binary_iso | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index f40eacee7..23af83c33 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 |