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