Bug 183488

Summary:	10.0-BETA2: docsinstall calls pkg_add
Product:	Base System	Reporter:	Mark Felder <feld>
Component:	misc	Assignee:	Glen Barber <gjb>
Status:	Closed FIXED
Severity:	Affects Only Me
Priority:	Normal
Version:	1.0-CURRENT
Hardware:	Any
OS:	Any

Description Mark Felder freebsd_committer

2013-10-30 16:00:02 UTC

On FreeBSD 10-BETA2 run bsdconfig, choose 2 Documentation and Installation, pick a lang or choose OK.


Could not install package
en-freebsd-doc
(/usr/libexec/bsdinstall/docsinstall:
pkg_add: not found)

Comment 1 dfilter service freebsd_committer

2013-11-06 15:49:39 UTC

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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 2 Glen Barber freebsd_committer

2013-11-06 15:50:05 UTC

State Changed
From-To: open->patched

Patched in r257749, pending MFC.

Comment 3 Glen Barber freebsd_committer

2013-11-06 15:50:05 UTC

Responsible Changed
From-To: freebsd-bugs->gjb

MFC reminder.

Comment 4 dfilter service freebsd_committer

2013-11-09 00:59:44 UTC

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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 5 Glen Barber freebsd_committer

2013-11-09 00:59:51 UTC

State Changed
From-To: patched->closed

Merged to stable/10 as r257875.