From owner-svn-src-head@FreeBSD.ORG  Wed Nov  6 15:49:31 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DDA2C7D5;
 Wed,  6 Nov 2013 15:49: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 CB9D228A4;
 Wed,  6 Nov 2013 15:49: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 rA6FnVnX035356;
 Wed, 6 Nov 2013 15:49:31 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6FnVta035354;
 Wed, 6 Nov 2013 15:49:31 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311061549.rA6FnVta035354@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 6 Nov 2013 15:49:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257749 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Wed, 06 Nov 2013 15:49:31 -0000

Author: gjb
Date: Wed Nov  6 15:49:31 2013
New Revision: 257749
URL: http://svnweb.freebsd.org/changeset/base/257749

Log:
  Switch to using pkg(8) for the doc install in bsdinstall(8).
  This also bootstraps the system with pkg(8) for future use.
  
  PR:		183488
  Submitted by:	Joe Ennis
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/usr.sbin/bsdinstall/scripts/docsinstall
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/docsinstall	Wed Nov  6 15:32:37 2013	(r257748)
+++ head/usr.sbin/bsdinstall/scripts/docsinstall	Wed Nov  6 15:49:31 2013	(r257749)
@@ -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