svn commit: r273005 - head/usr.sbin/bsdinstall/partedit

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Oct 12 17:59:31 2014
New Revision: 273005
URL: https://svnweb.freebsd.org/changeset/base/273005

Log:
  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.

Modified:
  head/usr.sbin/bsdinstall/partedit/partedit_x86.c

Modified: head/usr.sbin/bsdinstall/partedit/partedit_x86.c
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/partedit_x86.c	Sun Oct 12 17:56:02 2014	(r273004)
+++ head/usr.sbin/bsdinstall/partedit/partedit_x86.c	Sun Oct 12 17:59:31 2014	(r273005)
@@ -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, co
 		return (1);
 
 	if (strcmp(fs, "freebsd-zfs") == 0 &&
+	    strcmp(part_type, "GPT") == 0 &&
 	    strcmp(x86_bootmethod(), "BIOS") == 0)
 		return (1);