diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-09 00:59:31 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-09 00:59:31 +0000 |
| commit | 4f116e38229e29d70ca206ba622f8394dcf6278c (patch) | |
| tree | 7bfd94fe0d5f956318f2edff0443d9c3ed99058a /usr.sbin | |
| parent | 204a78e2fcfb13aed43b7cd2006d6ddace4de688 (diff) | |
| download | FreeBSD-src-4f116e38229e29d70ca206ba622f8394dcf6278c.zip FreeBSD-src-4f116e38229e29d70ca206ba622f8394dcf6278c.tar.gz | |
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
Diffstat (limited to 'usr.sbin')
| -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 |
