From owner-svn-src-all@FreeBSD.ORG Mon Jan 21 01:55:54 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CF8802E8; Mon, 21 Jan 2013 01:55:54 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BD9B6DD; Mon, 21 Jan 2013 01:55:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L1tswM004846; Mon, 21 Jan 2013 01:55:54 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L1tsvp004845; Mon, 21 Jan 2013 01:55:54 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201301210155.r0L1tsvp004845@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 21 Jan 2013 01:55:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245706 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 21 Jan 2013 01:55:54 -0000 Author: nwhitehorn Date: Mon Jan 21 01:55:54 2013 New Revision: 245706 URL: http://svnweb.freebsd.org/changeset/base/245706 Log: More automated install support: if a script exists at /etc/installerconfig, point the installer there and then reboot without asking questions. This design subject to future change. Modified: head/release/rc.local Modified: head/release/rc.local ============================================================================== --- head/release/rc.local Mon Jan 21 01:46:36 2013 (r245705) +++ head/release/rc.local Mon Jan 21 01:55:54 2013 (r245706) @@ -45,6 +45,17 @@ else fi export TERM +if [ -f /etc/installerconfig ]; then + bsdinstall script /etc/installerconfig + if [ $? -eq 0]; then + dialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 + reboot + else + dialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 + fi + exit +fi + dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 case $? in