From owner-svn-soc-all@FreeBSD.ORG Sun May 25 21:26:06 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14E63FF9 for ; Sun, 25 May 2014 21:26:06 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA4A3234D for ; Sun, 25 May 2014 21:26:05 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PLQ5D5017497 for ; Sun, 25 May 2014 21:26:05 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4PLQ54L017249 for svn-soc-all@FreeBSD.org; Sun, 25 May 2014 21:26:05 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 25 May 2014 21:26:05 GMT Message-Id: <201405252126.s4PLQ54L017249@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r268617 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 21:26:06 -0000 Author: kczekirda Date: Sun May 25 21:26:05 2014 New Revision: 268617 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268617 Log: services done Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun May 25 21:26:00 2014 (r268616) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun May 25 21:26:05 2014 (r268617) @@ -46,9 +46,10 @@ # RELEASE if not exist - 10.0-RELEASE # HOSTNAME to TMPETC if not exist, don't set # KEYMAP to TMPETC if not exist, don't set +# DAEMONS to TMPETC if not exist, set only sshd # TIMEZONE to /tmp/bsdinstall-installscript-ab -# TODO: ADD VARIABLES: (services, docinstall) +# TODO: ADD VARIABLES: (docinstall) ############################################################ GLOBALS @@ -101,7 +102,6 @@ fi # Build mirror path - if [ -z $MIRROR ]; then MIRROR="ftp://ftp.freebsd.org" fi @@ -118,19 +118,32 @@ export BSDINSTALL_DISTSITE # Hostname - if [ -n $HOSTNAME ]; then echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname fi # Keymap - if [ -n $KEYMAP ]; then echo "keymap=\"$KEYMAP\"" > $BSDINSTALL_TMPETC/rc.conf.keymap fi -# Time zone +# Services +if [ -n "$DAEMONS" ]; then + havedump= + for daemon in $DAEMONS; do + [ "$daemon" = "dumpdev" ] && havedump=1 continue + echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services + done + if [ "$havedump" ]; then + echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services + else + echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services + fi +else + echo "sshd_enable=\"YES\"" > $BSDINSTALL_TMPETC/rc.conf.services +fi +# Time zone if [ -n $TIMEZONE ]; then if [ ! -f /tmp/bsdinstall-installscript-ab ]; then echo "#!/bin/sh" > /tmp/bsdinstall-installscript-ab