From owner-svn-src-user@FreeBSD.ORG Sun Jan 30 15:36:59 2011 Return-Path: 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 947011065675; Sun, 30 Jan 2011 15:36: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 850068FC1F; Sun, 30 Jan 2011 15:36: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 p0UFaxh3076395; Sun, 30 Jan 2011 15:36:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UFaxOW076393; Sun, 30 Jan 2011 15:36:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101301536.p0UFaxOW076393@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 30 Jan 2011 15:36:59 +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: r218097 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 15:36:59 -0000 Author: nwhitehorn Date: Sun Jan 30 15:36:59 2011 New Revision: 218097 URL: http://svn.freebsd.org/changeset/base/218097 Log: Allow the services menu to keep state. Now, if it is reentered, the same boxes that were ticked earlier remain ticked. Modified: user/nwhitehorn/bsdinstall/scripts/services Modified: user/nwhitehorn/bsdinstall/scripts/services ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/services Sun Jan 30 15:36:19 2011 (r218096) +++ user/nwhitehorn/bsdinstall/scripts/services Sun Jan 30 15:36:59 2011 (r218097) @@ -1,5 +1,12 @@ #!/bin/sh +if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then + eval `sed -e s/YES/on/I -e s/NO/off/I $BSDINSTALL_TMPETC/rc.conf.services` +else + # Default service states. Everything is off if not enabled. + sshd_enable="on" +fi + echo -n > $BSDINSTALL_TMPETC/rc.conf.services exec 3>&1 @@ -7,9 +14,10 @@ DAEMONS=$(dialog --backtitle "FreeBSD In --title "System Configuration" --nocancel --separate-output \ --checklist "Choose the services you would like to be started at boot:" \ 0 0 0 \ - sshd "Secure shell daemon" on \ - ntpd "Synchronize system and network time" off \ - powerd "Adjust CPU frequency dynamically" off \ + sshd "Secure shell daemon" ${sshd_enable:-off} \ + moused "PS/2 mouse pointer on console" ${moused_enable:-off} \ + ntpd "Synchronize system and network time" ${ntpd_enable:-off} \ + powerd "Adjust CPU frequency dynamically" ${powerd_enable:-off} \ 2>&1 1>&3) exec 3>&-