vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move GRUB out of system area when using xorriso 1.2.9 or later.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-14 18:53:14 +02:00
parent 5351da81e0
commit b49fe8792a
5 changed files with 159 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

23
util/grub-mkrescue.in
View file

@ -365,15 +365,25 @@ if test -e "${pc_dir}" ; then
iso9660 biosdisk
cat "${pc_dir}/cdboot.img" "${core_img}" > "${iso9660_dir}/boot/grub/i386-pc/eltorito.img"
embed_img="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
cat "${pc_dir}/boot.img" "${core_img}" > "${embed_img}"
rm -f "${core_img}"
grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -no-emul-boot -boot-load-size 4 -boot-info-table"
if [ "$system_area" = common ]; then
grub_mkisofs_arguments="--embedded-boot ${embed_img}"
if "${xorriso}" -as mkisofs -help 2>&1 | fgrep "grub2-boot-info" >/dev/null; then
grub_mkisofs_arguments="${grub_mkisofs_arguments} --grub2-boot-info --grub2-mbr ${pc_dir}/boot_hybrid.img"
else
gettext "Your xorriso doesn't support \`--grub2-boot-info'. Some features are disabled. Please use xorriso 1.2.9 or later."
echo
sysarea_img="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
cat "${pc_dir}/boot.img" "${core_img}" > "${sysarea_img}"
if [ "$(wc -c "${sysarea_img}" | awk '{ print $1; }')" -gt 32768 ]; then
gettext "Your xorriso doesn't support \`--grub2-boot-info'. Your core image is too big. Boot as disk is disabled. Please use xorriso 1.2.9 or later."
echo
else
grub_mkisofs_arguments="${grub_mkisofs_arguments} -G ${sysarea_img}"
fi
fi
fi
rm -f "${core_img}"
fi
# build multiboot core.img
@ -495,6 +505,5 @@ fi
rm -rf "${iso9660_dir}"
rm -f "${sysarea_img}"
rm -f "${embed_img}"
exit 0