From owner-svn-src-head@FreeBSD.ORG  Fri Jan 30 21:22:19 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 71C2FD4C;
 Fri, 30 Jan 2015 21:22:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D2DEA59;
 Fri, 30 Jan 2015 21:22:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0ULMJTt082754;
 Fri, 30 Jan 2015 21:22:19 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0ULMJUe082753;
 Fri, 30 Jan 2015 21:22:19 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201501302122.t0ULMJUe082753@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 30 Jan 2015 21:22:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277950 - head/usr.sbin/bsdinstall/partedit
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2015 21:22:19 -0000

Author: nwhitehorn
Date: Fri Jan 30 21:22:18 2015
New Revision: 277950
URL: https://svnweb.freebsd.org/changeset/base/277950

Log:
  Use MBR by default on BIOS systems. An increasing number of motherboards
  assume that GPT means UEFI boot, resulting in the installation of
  uninstallable systems. This needs a little more work before MFC, in
  particular based on disk size (> 2 TB + BIOS + MBR is not workable). That
  will come soon.

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	Fri Jan 30 19:47:25 2015	(r277949)
+++ head/usr.sbin/bsdinstall/partedit/partedit_x86.c	Fri Jan 30 21:22:18 2015	(r277950)
@@ -51,7 +51,10 @@ x86_bootmethod(void)
 const char *
 default_scheme(void)
 {
-	return ("GPT");
+	if (strcmp(x86_bootmethod(), "UEFI") == 0)
+		return ("GPT");
+	else
+		return ("MBR");
 }
 
 int