d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using pkg(8) for the doc install in bsdinstall(8).

Browse Source 
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
This commit is contained in:
Glen Barber 2013-11-06 15:49:31 +00:00
parent 415fd8a3dc
commit 4ae21ddc1d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/bsdinstall/scripts/docsinstall
View File

@ -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