From owner-svn-src-head@FreeBSD.ORG  Thu Aug 18 16:00:33 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F595106564A;
	Thu, 18 Aug 2011 16:00:33 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EADF8FC13;
	Thu, 18 Aug 2011 16:00:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7IG0X8R063890;
	Thu, 18 Aug 2011 16:00:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7IG0X40063888;
	Thu, 18 Aug 2011 16:00:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201108181600.p7IG0X40063888@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 18 Aug 2011 16:00:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224972 - head/usr.sbin/bsdinstall/scripts
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Aug 2011 16:00:33 -0000

Author: nwhitehorn
Date: Thu Aug 18 16:00:32 2011
New Revision: 224972
URL: http://svn.freebsd.org/changeset/base/224972

Log:
  Fix a bug that prevented docsinstall from being able to use DNS in most
  cases and provide a better error handling mechanism during package
  installation.
  
  Approved by:	re (kib)

Modified:
  head/usr.sbin/bsdinstall/scripts/docsinstall

Modified: head/usr.sbin/bsdinstall/scripts/docsinstall
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/docsinstall	Thu Aug 18 15:31:31 2011	(r224971)
+++ head/usr.sbin/bsdinstall/scripts/docsinstall	Thu Aug 18 16:00:32 2011	(r224972)
@@ -59,11 +59,21 @@ NB: This requires a working, configured 
 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