From owner-svn-src-user@FreeBSD.ORG  Tue Jan 18 17:48:22 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 23074106564A;
	Tue, 18 Jan 2011 17:48:22 +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 122428FC13;
	Tue, 18 Jan 2011 17:48:22 +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 p0IHmL9x046037;
	Tue, 18 Jan 2011 17:48:21 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IHmLVE046034;
	Tue, 18 Jan 2011 17:48:21 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101181748.p0IHmLVE046034@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 18 Jan 2011 17:48:21 +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: r217547 - in user/nwhitehorn/bsdinstall: release 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: Tue, 18 Jan 2011 17:48:22 -0000

Author: nwhitehorn
Date: Tue Jan 18 17:48:21 2011
New Revision: 217547
URL: http://svn.freebsd.org/changeset/base/217547

Log:
  Warn user of impending reboot and move location of reboot dialog from auto
  to the rc.local wrapper script.

Modified:
  user/nwhitehorn/bsdinstall/release/rc.local
  user/nwhitehorn/bsdinstall/scripts/auto

Modified: user/nwhitehorn/bsdinstall/release/rc.local
==============================================================================
--- user/nwhitehorn/bsdinstall/release/rc.local	Tue Jan 18 17:35:34 2011	(r217546)
+++ user/nwhitehorn/bsdinstall/release/rc.local	Tue Jan 18 17:48:21 2011	(r217547)
@@ -16,6 +16,7 @@ $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
 	;;
 $DIALOG_CANCEL)	# Live CD

Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto	Tue Jan 18 17:35:34 2011	(r217546)
+++ user/nwhitehorn/bsdinstall/scripts/auto	Tue Jan 18 17:48:21 2011	(r217547)
@@ -84,7 +84,5 @@ bsdinstall adduser
 trap error SIGINT	# SIGINT is bad again
 bsdinstall config  || error
 
-dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete!" 0 0
-
 echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG