From owner-svn-src-user@FreeBSD.ORG  Sun Jan  9 17:19:05 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 23B65106564A;
	Sun,  9 Jan 2011 17:19:05 +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 13FC38FC15;
	Sun,  9 Jan 2011 17:19:05 +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 p09HJ48u050453;
	Sun, 9 Jan 2011 17:19:04 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p09HJ4RT050451;
	Sun, 9 Jan 2011 17:19:04 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101091719.p09HJ4RT050451@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 9 Jan 2011 17:19:04 +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: r217201 - user/nwhitehorn/bsdinstall
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 17:19:05 -0000

Author: nwhitehorn
Date: Sun Jan  9 17:19:04 2011
New Revision: 217201
URL: http://svn.freebsd.org/changeset/base/217201

Log:
  Some more SIGINT handling. Ideally, bsdinstall auto would learn which steps
  are skippable and allow cntrl-C to skip them, but that will have to wait
  until later.

Modified:
  user/nwhitehorn/bsdinstall/rc.local

Modified: user/nwhitehorn/bsdinstall/rc.local
==============================================================================
--- user/nwhitehorn/bsdinstall/rc.local	Sun Jan  9 17:10:06 2011	(r217200)
+++ user/nwhitehorn/bsdinstall/rc.local	Sun Jan  9 17:19:04 2011	(r217201)
@@ -14,6 +14,7 @@ cdialog --backtitle "FreeBSD Installer" 
 case $? in
 $DIALOG_OK)	# Installer
 	BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT
+	trap "" SIGINT	# Ignore cntrl-C here
 	bsdinstall
 	reboot
 	;;