From owner-svn-src-head@FreeBSD.ORG  Sat Apr  9 14:25:59 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 49F201065672;
	Sat,  9 Apr 2011 14:25:59 +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 3882B8FC14;
	Sat,  9 Apr 2011 14:25:59 +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 p39EPxkK017039;
	Sat, 9 Apr 2011 14:25:59 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39EPxjj017037;
	Sat, 9 Apr 2011 14:25:59 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201104091425.p39EPxjj017037@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 9 Apr 2011 14:25:59 +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: r220500 - head/release
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: Sat, 09 Apr 2011 14:25:59 -0000

Author: nwhitehorn
Date: Sat Apr  9 14:25:58 2011
New Revision: 220500
URL: http://svn.freebsd.org/changeset/base/220500

Log:
  Allow the user to use the live environment post-installation, as well
  as improving error handling.

Modified:
  head/release/rc.local

Modified: head/release/rc.local
==============================================================================
--- head/release/rc.local	Sat Apr  9 14:18:03 2011	(r220499)
+++ head/release/rc.local	Sat Apr  9 14:25:58 2011	(r220500)
@@ -17,8 +17,11 @@ $DIALOG_OK)	# Install
 	BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT
 	trap true SIGINT	# Ignore cntrl-C here
 	bsdinstall
-	dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete! The system will now reboot." 0 0
-	reboot
+	if [ $? -eq 0 ]; then
+		dialog --backtitle "FreeBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot
+	else
+		. /etc/rc.local
+	fi
 	;;
 $DIALOG_CANCEL)	# Live CD
 	exit 0