From 5217d3b6a8fd78604b0c64a75e2f52308aade398 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 17 Apr 2013 19:08:31 +0200 Subject: [PATCH 322/364] * util/grub-mkrescue.in: Add GPT for EFI boot. --- ChangeLog | 4 ++++ util/grub-mkrescue.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d77a7f..eb92ae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-04-17 Vladimir Serbinenko + * util/grub-mkrescue.in: Add GPT for EFI boot. + +2013-04-17 Vladimir Serbinenko + * grub-core/disk/efi/efidisk.c: Detect floppies by ACPI ID. It improves performance in qemu. diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index 7270d7f..c3ed39b 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -421,7 +421,7 @@ if test -e "${efi64_dir}" || test -e "${efi32_dir}" || test -e "${ia64_dir}"; th mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img :: mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/ rm -rf ${efi_dir} - grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img" + grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img -efi-boot-part --efi-boot-image" fi make_image_fwdisk "${ppc_dir}" powerpc-ieee1275 "${iso9660_dir}/boot/powerpc.elf" "" @@ -443,7 +443,7 @@ EOF "$grub_render_label" -f "$label_font" -b "$label_bgcolor" -c "$label_color" -t "${product_name} ${product_version}" -o "${iso9660_dir}/System/Library/CoreServices/.disk_label" echo "${product_name} ${product_version}" > "${iso9660_dir}/System/Library/CoreServices/.disk_label.contentDetails" if [ "$system_area" = common ]; then - grub_mkisofs_arguments="${grub_mkisofs_arguments} -hfsplus -hfsplus-file-creator-type chrp tbxj /System/Library/CoreServices/.disk_label" + grub_mkisofs_arguments="${grub_mkisofs_arguments} -hfsplus -apm-block-size 2048 -hfsplus-file-creator-type chrp tbxj /System/Library/CoreServices/.disk_label" fi fi -- 1.8.1.4