From owner-svn-src-stable@FreeBSD.ORG  Sat Nov  9 00:59:31 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D79845EB;
 Sat,  9 Nov 2013 00:59:31 +0000 (UTC) (envelope-from gjb@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 C3F5C2C5C;
 Sat,  9 Nov 2013 00:59:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA90xVxH031355;
 Sat, 9 Nov 2013 00:59:31 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA90xVYE031354;
 Sat, 9 Nov 2013 00:59:31 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311090059.rA90xVYE031354@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 9 Nov 2013 00:59:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257875 - stable/10/usr.sbin/bsdinstall/scripts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Nov 2013 00:59:31 -0000

Author: gjb
Date: Sat Nov  9 00:59:31 2013
New Revision: 257875
URL: http://svnweb.freebsd.org/changeset/base/257875

Log:
  MFC r257749:
    Switch to using pkg(8) for the doc install in bsdinstall(8).
    This also bootstraps the system with pkg(8) for future use.
  
  Approved by:	re (delphij)
  PR:		183488
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/bsdinstall/scripts/docsinstall
Directory Properties:
  stable/10/usr.sbin/bsdinstall/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/scripts/docsinstall
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/docsinstall	Sat Nov  9 00:36:09 2013	(r257874)
+++ stable/10/usr.sbin/bsdinstall/scripts/docsinstall	Sat Nov  9 00:59:31 2013	(r257875)
@@ -59,7 +59,7 @@ NB: This requires a working, configured 
 test $? -eq 0 || exit 0
 exec 3>&-
 
-# Let pkg_add be able to use name servers
+# Let pkg(8) be able to use name servers
 cp ${BSDINSTALL_TMPETC}/resolv.conf ${BSDINSTALL_CHROOT}/etc
 
 error() {
@@ -74,6 +74,13 @@ echo "FreeBSD Installer"
 echo "========================"
 echo
 
+echo "Please wait while the repository metadata is fetched."
+echo "This may take a few moments."
+
+env ASSUME_ALWAYS_YES=1 pkg -c ${BSDINSTALL_CHROOT} install pkg \
+	|| error pkg
+
 for i in $DOCS; do
-    pkg_add -C ${BSDINSTALL_CHROOT} -r ${i}-freebsd-doc || error $i-freebsd-doc
+    env ASSUME_ALWAYS_YES=1 pkg -c ${BSDINSTALL_CHROOT} install ${i}-freebsd-doc \
+	|| error $i-freebsd-doc
 done