socsvn commit: r268616 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts

kczekirda at FreeBSD.org kczekirda at FreeBSD.org
Sun May 25 21:26:01 UTC 2014


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


More information about the svn-soc-all mailing list