aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-01-30 23:57:39 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-01-30 23:57:39 +0000
commit174411efe9b6fbca9ae37325985fa14be36774b7 (patch)
treeb8ea37aec3bee69cb1d30673812ae5b514512490 /usr.sbin
parentf72f83dcae3d3c13bc60dff3bdbdc2c984a6a193 (diff)
parent803deb9a21c4e31165e444950444bf13d9111208 (diff)
downloadsrc-174411efe9b6fbca9ae37325985fa14be36774b7.tar.gz
src-174411efe9b6fbca9ae37325985fa14be36774b7.zip
Merge ^/head r277945 through r277955.
Notes
Notes: svn path=/projects/clang360-import/; revision=277956
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_x86.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index cc6a5713f945..6a606784ae20 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -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