diff options
author | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2014-10-12 17:59:31 +0000 |
---|---|---|
committer | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2014-10-12 17:59:31 +0000 |
commit | 403a3c8c82dd71e9a0beb7cc8ff9b1ba0a414061 (patch) | |
tree | f2c3bf932ab58620a804a4f0795acf59500f7cbd /usr.sbin/bsdinstall/partedit/partedit_x86.c | |
parent | 0dc54d18b29bfd0a501385dd95bbe42b535caf00 (diff) |
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.
Notes
Notes:
svn path=/head/; revision=273005
Diffstat (limited to 'usr.sbin/bsdinstall/partedit/partedit_x86.c')
-rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit_x86.c | 4 |
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 8bd4027b583f..cc6a5713f945 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); |