svn commit: r283860 - stable/10/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Mon Jun  1 01:31:50 2015
New Revision: 283860
URL: https://svnweb.freebsd.org/changeset/base/283860

Log:
  MFC SVN revisions 280234-280235:
  r280234: Fix the handbook install option in bsdinstall (allanjude)
  r280235: Fixup to previous (allanjude)

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

Modified: stable/10/usr.sbin/bsdinstall/scripts/docsinstall
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/docsinstall	Mon Jun  1 01:06:33 2015	(r283859)
+++ stable/10/usr.sbin/bsdinstall/scripts/docsinstall	Mon Jun  1 01:31:50 2015	(r283860)
@@ -154,10 +154,13 @@ f_quietly cp -f $BSDINSTALL_TMPETC/resol
 #
 # 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
 ################################################################################