Date: Sat, 9 Nov 2013 00:59:31 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257875 - stable/10/usr.sbin/bsdinstall/scripts Message-ID: <201311090059.rA90xVYE031354@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311090059.rA90xVYE031354>