From owner-svn-src-head@FreeBSD.ORG  Wed Mar 18 23:24:39 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 44D41E57;
 Wed, 18 Mar 2015 23:24:39 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2FC24D06;
 Wed, 18 Mar 2015 23:24:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2INOdgV056339;
 Wed, 18 Mar 2015 23:24:39 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2INOdVJ056338;
 Wed, 18 Mar 2015 23:24:39 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201503182324.t2INOdVJ056338@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Wed, 18 Mar 2015 23:24:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280234 - 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.18-1
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, 18 Mar 2015 23:24:39 -0000

Author: allanjude (doc committer)
Date: Wed Mar 18 23:24:38 2015
New Revision: 280234
URL: https://svnweb.freebsd.org/changeset/base/280234

Log:
  Fix the handbook install option in bsdinstall
  
  bsdconfig's f_package_add doesn't seem to support using the pkg repo from /etc/pkg/FreeBSD.conf, it also tries to run the commands on the installer image, not in the destination chroot
  
  Instead, manually bootstrap pkg in the chroot, and then install the requested packages (in the chroot)
  
  Doesn't use pkg -c, because pkg is not installed on the installer image
  
  PR:		196250
  Differential Revision:	https://reviews.freebsd.org/D2026
  Approved by:	bapt
  Sponsored by:	ScaleEngine Inc.

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

Modified: head/usr.sbin/bsdinstall/scripts/docsinstall
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/docsinstall	Wed Mar 18 23:24:25 2015	(r280233)
+++ head/usr.sbin/bsdinstall/scripts/docsinstall	Wed Mar 18 23:24:38 2015	(r280234)
@@ -151,13 +151,20 @@ f_dialog_menutag_fetch selected
 # Let pkg_add be able to use name servers
 f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/
 
+if [ ! -x $BSDINSTALL_CHROOT ]; then
+	ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg bootstrap
+fi
+
 #
 # Install each of the selected packages
 #
+docsets=""
 for lang in $selected; do
-	f_package_add $lang-freebsd-doc || return $FAILURE
+	docsets="$docsets $lang-freebsd-doc"
 done
 
+ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg install $docsets || return $FAILURE
+
 ################################################################################
 # END
 ################################################################################