From owner-svn-src-user@FreeBSD.ORG  Sun Jan  9 06:12:33 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6165F106566C;
	Sun,  9 Jan 2011 06:12: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 5197F8FC08;
	Sun,  9 Jan 2011 06:12:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p096CXor031675;
	Sun, 9 Jan 2011 06:12:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p096CXCM031673;
	Sun, 9 Jan 2011 06:12:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101090612.p096CXCM031673@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 9 Jan 2011 06:12:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217183 - user/nwhitehorn/bsdinstall/scripts
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Jan 2011 06:12:33 -0000

Author: nwhitehorn
Date: Sun Jan  9 06:12:33 2011
New Revision: 217183
URL: http://svn.freebsd.org/changeset/base/217183

Log:
  Nothing between distextract and config need succeed, so allow the user
  to cancel these with impunity.
  
  Suggested by:	brucec

Modified:
  user/nwhitehorn/bsdinstall/scripts/auto

Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto	Sun Jan  9 06:05:48 2011	(r217182)
+++ user/nwhitehorn/bsdinstall/scripts/auto	Sun Jan  9 06:12:33 2011	(r217183)
@@ -44,13 +44,13 @@ if [ ! -z $FETCH_DISTRIBUTIONS ]; then
 fi
 
 bsdinstall distextract || error
-bsdinstall rootpass || error
+bsdinstall rootpass
 if [ "$NETCONFIG_DONE" != yes ]; then
 	bsdinstall netconfig	# Don't check for errors -- the user may cancel
 fi
-bsdinstall time || error
-bsdinstall services || error
-bsdinstall adduser || error
+bsdinstall time
+bsdinstall services
+bsdinstall adduser
 bsdinstall config  || error
 
 cdialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete!" 0 0