diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-06 15:49:31 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-06 15:49:31 +0000 |
| commit | 2ed67b9eb8b4b7e56aff59e01f4884094fa05b8d (patch) | |
| tree | ee6b51e5438185943f9f39a9eb01f4fabebe85b9 | |
| parent | 32e7b0e2ad4e02afc86137b4c1bbe61562dbdf62 (diff) | |
| download | FreeBSD-src-2ed67b9eb8b4b7e56aff59e01f4884094fa05b8d.zip FreeBSD-src-2ed67b9eb8b4b7e56aff59e01f4884094fa05b8d.tar.gz | |
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
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/docsinstall | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/docsinstall b/usr.sbin/bsdinstall/scripts/docsinstall index e16116c..46d731f 100755 --- a/usr.sbin/bsdinstall/scripts/docsinstall +++ b/usr.sbin/bsdinstall/scripts/docsinstall @@ -59,7 +59,7 @@ NB: This requires a working, configured network connection." 0 0 0 \ 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 |
