View | Details | Raw Unified | Return to bug 224943
Collapse All | Expand All

(-)usr.sbin/bsdinstall/partedit/partedit_x86.c (-5 / +7 lines)
Lines 36-42 Link Here
36
36
37
/* EFI partition size in bytes */
37
/* EFI partition size in bytes */
38
#define	EFI_BOOTPART_SIZE	(200 * 1024 * 1024)
38
#define	EFI_BOOTPART_SIZE	(200 * 1024 * 1024)
39
#define	EFI_BOOTPART_PATH	"/boot/boot1.efifat"
40
39
41
static const char *
40
static const char *
42
x86_bootmethod(void)
41
x86_bootmethod(void)
Lines 114-121 Link Here
114
bootpart_type(const char *scheme, const char **mountpoint)
113
bootpart_type(const char *scheme, const char **mountpoint)
115
{
114
{
116
115
117
	if (strcmp(x86_bootmethod(), "UEFI") == 0)
116
	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
117
		*mountpoint = "/efi";
118
		return ("efi");
118
		return ("efi");
119
	}
119
120
120
	return ("freebsd-boot");
121
	return ("freebsd-boot");
121
}
122
}
Lines 141-150 Link Here
141
partcode_path(const char *part_type, const char *fs_type)
142
partcode_path(const char *part_type, const char *fs_type)
142
{
143
{
143
144
145
	if (strcmp(x86_bootmethod(), "UEFI") == 0)
146
		return (NULL); /* Mountable on EFI */
147
144
	if (strcmp(part_type, "GPT") == 0) {
148
	if (strcmp(part_type, "GPT") == 0) {
145
		if (strcmp(x86_bootmethod(), "UEFI") == 0)
149
		if (strcmp(fs_type, "zfs") == 0)
146
			return (EFI_BOOTPART_PATH);
147
		else if (strcmp(fs_type, "zfs") == 0)
148
			return ("/boot/gptzfsboot");
150
			return ("/boot/gptzfsboot");
149
		else
151
		else
150
			return ("/boot/gptboot");
152
			return ("/boot/gptboot");

Return to bug 224943