aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bsdinstall
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-08-18 16:00:32 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-08-18 16:00:32 +0000
commit05b56666d37d98e73697caf1cdf929d02b698a2f (patch)
tree37b5ec0dbde72af280a295e343d1d62f598b0056 /usr.sbin/bsdinstall
parentad06556a9188f81ef498172223882a998fca8b8b (diff)
Notes
Diffstat (limited to 'usr.sbin/bsdinstall')
-rw-r--r--usr.sbin/bsdinstall/scripts/docsinstall12
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/docsinstall b/usr.sbin/bsdinstall/scripts/docsinstall
index e037dcc424efd..e16116c62623c 100644
--- a/usr.sbin/bsdinstall/scripts/docsinstall
+++ b/usr.sbin/bsdinstall/scripts/docsinstall
@@ -59,11 +59,21 @@ 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
+cp ${BSDINSTALL_TMPETC}/resolv.conf ${BSDINSTALL_CHROOT}/etc
+
+error() {
+ dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \
+ "Could not install package $1 (`tail -n 1 ${BSDINSTALL_LOG}`)" 0 0
+ exit 1
+}
+
+
clear
echo "FreeBSD Installer"
echo "========================"
echo
for i in $DOCS; do
- pkg_add -C ${BSDINSTALL_CHROOT} -r ${i}-freebsd-doc
+ pkg_add -C ${BSDINSTALL_CHROOT} -r ${i}-freebsd-doc || error $i-freebsd-doc
done