summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2014-10-12 17:59:31 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2014-10-12 17:59:31 +0000
commit73e76bf94f92c154977b7f2bca22cb460ec21d46 (patch)
treef2c3bf932ab58620a804a4f0795acf59500f7cbd
parent7ce509c4a0ebb7acfdc76cc0eb468542c9b4205e (diff)
downloadFreeBSD-src-73e76bf94f92c154977b7f2bca22cb460ec21d46.zip
FreeBSD-src-73e76bf94f92c154977b7f2bca22cb460ec21d46.tar.gz
Only allow ZFS boot on GPT; the MBR ZFS bootblocks cannot be installed using
gpart bootcode as /boot/zfsboot needs to be split into multiple pieces by hand and copied to different areas of the partition.
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 8bd4027b..cc6a571 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -49,7 +49,8 @@ x86_bootmethod(void)
}
const char *
-default_scheme(void) {
+default_scheme(void)
+{
return ("GPT");
}
@@ -77,6 +78,7 @@ is_fs_bootable(const char *part_type, const char *fs)
return (1);
if (strcmp(fs, "freebsd-zfs") == 0 &&
+ strcmp(part_type, "GPT") == 0 &&
strcmp(x86_bootmethod(), "BIOS") == 0)
return (1);
OpenPOWER on IntegriCloud