From owner-svn-src-user@FreeBSD.ORG Fri Jan 7 16:51:47 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 BD0C1106566B; Fri, 7 Jan 2011 16:51:47 +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 91CBA8FC12; Fri, 7 Jan 2011 16:51:47 +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 p07GplxG059156; Fri, 7 Jan 2011 16:51:47 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p07Gplt0059151; Fri, 7 Jan 2011 16:51:47 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101071651.p07Gplt0059151@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 7 Jan 2011 16:51:47 +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: r217111 - 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: Fri, 07 Jan 2011 16:51:47 -0000 Author: nwhitehorn Date: Fri Jan 7 16:51:47 2011 New Revision: 217111 URL: http://svn.freebsd.org/changeset/base/217111 Log: Split application of configuration and setting up ssh, etc. into two scripts and allow the user to set the system time zone by running tzsetup in a chroot. The 'time' script could potentially allow setting the system clock as well, depending on how fancy we want to get. Added: user/nwhitehorn/bsdinstall/scripts/services - copied, changed from r217084, user/nwhitehorn/bsdinstall/scripts/config user/nwhitehorn/bsdinstall/scripts/time Modified: user/nwhitehorn/bsdinstall/scripts/auto user/nwhitehorn/bsdinstall/scripts/config Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 7 16:47:20 2011 (r217110) +++ user/nwhitehorn/bsdinstall/scripts/auto Fri Jan 7 16:51:47 2011 (r217111) @@ -43,6 +43,8 @@ fi bsdinstall distextract || error bsdinstall rootpass || error +bsdinstall time || error +bsdinstall services || error bsdinstall adduser || error bsdinstall config || error Modified: user/nwhitehorn/bsdinstall/scripts/config ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/config Fri Jan 7 16:47:20 2011 (r217110) +++ user/nwhitehorn/bsdinstall/scripts/config Fri Jan 7 16:51:47 2011 (r217111) @@ -1,20 +1,5 @@ #!/bin/sh -exec 3>&1 -DAEMONS=$(cdialog --backtitle "FreeBSD Installer" \ - --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 \ -2>&1 1>&3) -exec 3>&- - -for daemon in $DAEMONS; do - echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf -done - cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf Copied and modified: user/nwhitehorn/bsdinstall/scripts/services (from r217084, user/nwhitehorn/bsdinstall/scripts/config) ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/config Thu Jan 6 22:57:06 2011 (r217084, copy source) +++ user/nwhitehorn/bsdinstall/scripts/services Fri Jan 7 16:51:47 2011 (r217111) @@ -15,6 +15,3 @@ for daemon in $DAEMONS; do echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf done -cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab -cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf -cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf Added: user/nwhitehorn/bsdinstall/scripts/time ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/scripts/time Fri Jan 7 16:51:47 2011 (r217111) @@ -0,0 +1,3 @@ +#!/bin/sh + +chroot $BSDINSTALL_CHROOT tzsetup