From owner-svn-src-all@FreeBSD.ORG  Mon Nov 11 21:42:57 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6E7B94FB;
 Mon, 11 Nov 2013 21:42:57 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5BD2E2A19;
 Mon, 11 Nov 2013 21:42:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABLgv5t030404;
 Mon, 11 Nov 2013 21:42:57 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABLgvhG030403;
 Mon, 11 Nov 2013 21:42:57 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201311112142.rABLgvhG030403@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 11 Nov 2013 21:42:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258021 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 21:42:57 -0000

Author: dteske
Date: Mon Nov 11 21:42:56 2013
New Revision: 258021
URL: http://svnweb.freebsd.org/changeset/base/258021

Log:
  Switch default MBR bootcode from /boot/boot0 to /boot/mbr.
  
  Reviewed by:	Allan Jude, nwhitehorn
  Discussed on:	-current

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Nov 11 21:42:31 2013	(r258020)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Nov 11 21:42:56 2013	(r258021)
@@ -764,7 +764,7 @@ zfs_create_diskpart()
 		#
 		f_eval_catch $funcname gpart "$GPART_CREATE" mbr \$disk ||
 		             return $FAILURE
-		f_eval_catch $funcname gpart "$GPART_BOOTCODE" /boot/boot0 \
+		f_eval_catch $funcname gpart "$GPART_BOOTCODE" /boot/mbr \
 		             \$disk || return $FAILURE
 
 		#