From owner-svn-src-all@FreeBSD.ORG  Wed Nov 10 05:32:36 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 69D781065670;
	Wed, 10 Nov 2010 05:32:36 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58E598FC19;
	Wed, 10 Nov 2010 05:32:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAA5WaUM085568;
	Wed, 10 Nov 2010 05:32:36 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAA5WahA085566;
	Wed, 10 Nov 2010 05:32:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201011100532.oAA5WahA085566@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 10 Nov 2010 05:32:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215078 - head/usr.sbin/pc-sysinstall/backend
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 10 Nov 2010 05:32:36 -0000

Author: imp
Date: Wed Nov 10 05:32:36 2010
New Revision: 215078
URL: http://svn.freebsd.org/changeset/base/215078

Log:
  When we switched to the gpart backend, and provided selection between
  MBR & GPT, the MBR full-disk init failed to stamp boot1, and results
  in a boot not found error. This patch fixes the issue.
  
  PR:		151990
  Submitted by:	Kris Moore

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh	Wed Nov 10 05:22:12 2010	(r215077)
+++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh	Wed Nov 10 05:32:36 2010	(r215078)
@@ -646,8 +646,11 @@ init_mbr_full_disk()
   rc_halt "dd if=/dev/zero of=/dev/${_intDISK}s1 count=1024"
   
   if [ "$_intBOOT" = "bsd" ] ; then
-    echo_log "Stamping boot sector on ${_intDISK}"
+    echo_log "Stamping boot0 on ${_intDISK}"
     rc_halt "gpart bootcode -b /boot/boot0 ${_intDISK}"
+  else
+    echo_log "Stamping boot1 on ${_intDISK}"
+    rc_halt "gpart bootcode -b /boot/boot1 ${_intDISK}"
   fi
 
 }