diff options
| author | emaste <emaste@FreeBSD.org> | 2017-06-19 03:07:00 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2017-06-19 03:07:00 +0000 |
| commit | a249b94418fc905d8e8ea4829e6071170bebd283 (patch) | |
| tree | 89aa67fafa9885abf22509e2939b6bc4c016e441 /usr.sbin/bsdinstall/partedit/partedit_x86.c | |
| parent | b641a516f9e321f101e03134aec14efca25bc07c (diff) | |
| download | FreeBSD-src-a249b94418fc905d8e8ea4829e6071170bebd283.zip FreeBSD-src-a249b94418fc905d8e8ea4829e6071170bebd283.tar.gz | |
bsdinstall: use consistent EFI configuration across platforms
MFC r320007:
- 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
MFC r320008: bsdinstall: correct comment after r320007
PR: 201898
Approved by: re (kib)
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
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 5616e58..a5f65ba 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 |
