diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-06-16 18:58:48 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-06-16 18:58:48 +0000 |
| commit | 4ca43ae5f29a898f6c6ebe0724643dcb8a18bf6f (patch) | |
| tree | 8b83f96d2d13098457a87a8a06d8aa3cdfb0320d /usr.sbin/bsdinstall/partedit/partedit_x86.c | |
| parent | 2d80caa28aefcc8dab1f10301ed19d23fd37a4ef (diff) | |
bsdinstall: use consistent EFI configuration across platforms
- increase arm64 EFI partition to 200M, as x86
- use EFI_BOOTPART_SIZE and EFI_BOOTPART_PATH macros on x86
- increase ZFS EFI partition to 200M
PR: 201898
Reviewed by: allanjude, manu
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D11239
Notes
Notes:
svn path=/head/; revision=320007
Diffstat (limited to 'usr.sbin/bsdinstall/partedit/partedit_x86.c')
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit_x86.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c index 5616e580fe47..a5f65ba4c759 100644 --- a/usr.sbin/bsdinstall/partedit/partedit_x86.c +++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c @@ -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) { @@ -99,7 +103,7 @@ bootpart_size(const char *scheme) if (strcmp(x86_bootmethod(), "BIOS") == 0) return (512*1024); else - return (200*1024*1024); + return (EFI_BOOTPART_SIZE); return (0); } @@ -137,7 +141,7 @@ partcode_path(const char *part_type, const char *fs_type) 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 |