d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bsdinstall: use consistent EFI configuration across platforms

Browse Source 
- 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
This commit is contained in:
emaste 2017-06-16 18:58:48 +00:00
parent f914f0a249
commit d064913beb
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/bsdinstall/partedit/partedit_arm64.c
View File

@ -35,7 +35,7 @@
#include "partedit.h"
/* EFI partition size in KB */
#define EFI_BOOTPART_SIZE (50 * 1024)
#define EFI_BOOTPART_SIZE (200 * 1024 * 1024)
#define EFI_BOOTPART_PATH "/boot/boot1.efifat"
const char *
@ -73,7 +73,7 @@ bootpart_size(const char *scheme)
if (strcmp(scheme, "GPT") != 0)
return (0);
return ((EFI_BOOTPART_SIZE) * 1024);
return (EFI_BOOTPART_SIZE);
}
const char *

8
usr.sbin/bsdinstall/partedit/partedit_x86.c
View File

@ -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

2
usr.sbin/bsdinstall/scripts/zfsboot
View File

@ -848,7 +848,7 @@ zfs_create_diskpart()
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 ||