From owner-svn-src-all@FreeBSD.ORG Sat Apr 9 14:18:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C72A7106564A; Sat, 9 Apr 2011 14:18:03 +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 B56448FC08; Sat, 9 Apr 2011 14:18:03 +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 p39EI3YI016565; Sat, 9 Apr 2011 14:18:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p39EI3sj016563; Sat, 9 Apr 2011 14:18:03 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201104091418.p39EI3sj016563@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 9 Apr 2011 14:18:03 +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: r220499 - head/usr.sbin/bsdinstall/scripts X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2011 14:18:03 -0000 Author: nwhitehorn Date: Sat Apr 9 14:18:03 2011 New Revision: 220499 URL: http://svn.freebsd.org/changeset/base/220499 Log: Rename the "Reboot" option to "Exit", which reflects what it actually does. The rc.local wrapper script will also soon grow an option to use the live environment after installation, so an immediate reboot isn't even necessarily implied. Modified: head/usr.sbin/bsdinstall/scripts/auto Modified: head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- head/usr.sbin/bsdinstall/scripts/auto Sat Apr 9 14:09:46 2011 (r220498) +++ head/usr.sbin/bsdinstall/scripts/auto Sat Apr 9 14:18:03 2011 (r220499) @@ -167,7 +167,7 @@ finalconfig() { "Services" "Set daemons to run on startup" \ "Time Zone" "Set system timezone" \ "Shell" "Open a shell in the new system" \ - "Reboot" "Apply configuration and reboot" 2>&1 1>&3) + "Exit" "Apply configuration and exit installer" 2>&1 1>&3) exec 3>&- case "$REVISIT" in