manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplyfing grub-mkimage legacy handling for lenny in lb_binary_iso.

This commit is contained in:
Daniel Baumann 2011-01-17 10:01:25 +01:00
parent 218610081a
commit 251b0ae47f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/build/lb_binary_iso
View File

@ -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