From owner-svn-soc-all@FreeBSD.ORG  Sun May 25 21:26:01 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 897B0FE9
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:26:01 +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 75716234C
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:26:01 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PLQ18X015731
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:26:01 GMT
 (envelope-from kczekirda@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4PLQ1ru015510
 for svn-soc-all@FreeBSD.org; Sun, 25 May 2014 21:26:01 GMT
 (envelope-from kczekirda@FreeBSD.org)
Date: Sun, 25 May 2014 21:26:01 GMT
Message-Id: <201405252126.s4PLQ1ru015510@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: r268616 -
 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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 May 2014 21:26:01 -0000

Author: kczekirda
Date: Sun May 25 21:26:00 2014
New Revision: 268616
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268616

Log:
  timezone

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:25:55 2014	(r268615)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun May 25 21:26:00 2014	(r268616)
@@ -46,9 +46,9 @@
 # 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
-# TIMEZONE	to TMPETC
+# TIMEZONE	to /tmp/bsdinstall-installscript-ab
 
-# TODO: ADD VARIABLES: (timezone, services, docinstall)
+# TODO: ADD VARIABLES: (services, docinstall)
 
 ############################################################ GLOBALS
 
@@ -120,13 +120,22 @@
 # Hostname
 
 if [ -n $HOSTNAME ]; then
-	echo "hostname=\"$HOSTNAME\"" >> $BSDINSTALL_TMPETC/rc.conf.hostname
+	echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname
 fi
 
-# Add Keymap to setup script
+# Keymap
 
 if [ -n $KEYMAP ]; then
-        echo "keymap=\"$KEYMAP\"" >> $BSDINSTALL_TMPETC/rc.conf.keymap
+        echo "keymap=\"$KEYMAP\"" > $BSDINSTALL_TMPETC/rc.conf.keymap
+fi
+
+# Time zone
+
+if [ -n $TIMEZONE ]; then
+	if [ ! -f /tmp/bsdinstall-installscript-ab ]; then
+		echo "#!/bin/sh" > /tmp/bsdinstall-installscript-ab
+	fi
+        echo "echo \"$TIMEZONE\" > /var/db/zoneinfo; tzsetup -r" >> /tmp/bsdinstall-installscript-ab 
 fi
 
 # Make partitions