Author: emaste
Date: Wed Jul 19 14:15:49 2017
New Revision: 321202
URL: https://svnweb.freebsd.org/changeset/base/321202
Log:
MFC r302145: bsdinstall: increase EFI partition size to 200MB
A larger EFI file system size will facilitate multi-boot configurations
and the installation other EFI applications like firmware update tools.
200MB matches OS X.
Note that this changes only the partition size, not the file system that
bsdinstall places there. We need to do both, but as the partition size
is difficult to adjust later make this change for now so that at least
systems installed with FreeBSD 11.0 have a partition layout with room
to grow.
Also merge part of r320007:
- use EFI_BOOTPART_SIZE and EFI_BOOTPART_PATH macros on x86
- increase ZFS EFI partition to 200M
PR: 201898
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.sbin/bsdinstall/partedit/partedit_x86.c
stable/10/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsdinstall/partedit/partedit_x86.c
==============================================================================
--- stable/10/usr.sbin/bsdinstall/partedit/partedit_x86.c Wed Jul 19
14:07:38 2017 (r321201)
+++ stable/10/usr.sbin/bsdinstall/partedit/partedit_x86.c Wed Jul 19
14:15:49 2017 (r321202)
@@ -32,6 +32,10 @@
#include "partedit.h"
+/* EFI partition size in bytes */
+#define EFI_BOOTPART_SIZE (200 * 1024 * 1024)
+#define EFI_BOOTPART_PATH "/boot/boot1.efifat"
+
static const char *
x86_bootmethod(void)
{
@@ -96,7 +100,7 @@ bootpart_size(const char *scheme)
if (strcmp(x86_bootmethod(), "BIOS") == 0)
return (512*1024);
else
- return (800*1024);
+ return (EFI_BOOTPART_SIZE);
return (0);
}
@@ -134,7 +138,7 @@ partcode_path(const char *part_type, const char *fs_ty
if (strcmp(part_type, "GPT") == 0) {
if (strcmp(x86_bootmethod(), "UEFI") == 0)
- return ("/boot/boot1.efifat");
+ return (EFI_BOOTPART_PATH);
else if (strcmp(fs_type, "zfs") == 0)
return ("/boot/gptzfsboot");
else
Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/zfsboot Wed Jul 19 14:07:38
2017 (r321201)
+++ stable/10/usr.sbin/bsdinstall/scripts/zfsboot Wed Jul 19 14:15:49
2017 (r321202)
@@ -816,7 +816,7 @@ zfs_create_diskpart()
if [ "$ZFSBOOT_BOOT_TYPE" = "UEFI" ]; then
f_eval_catch $funcname gpart \
"$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
- "$align_small" efiboot$index efi 800k
$disk ||
+ "$align_small" efiboot$index efi 200M
$disk ||
return $FAILURE
f_eval_catch $funcname gpart "$GPART_BOOTCODE_PARTONLY"
\
/boot/boot1.efifat 1 $disk ||
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
