From owner-svn-soc-all@FreeBSD.ORG  Sun May 25 21:25:52 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
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 70E5EFC9
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:25:52 +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 5D393234A
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:25:52 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PLPqR1012135
 for <svn-soc-all@FreeBSD.org>; Sun, 25 May 2014 21:25:52 GMT
 (envelope-from kczekirda@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4PLPp1C011928
 for svn-soc-all@FreeBSD.org; Sun, 25 May 2014 21:25:51 GMT
 (envelope-from kczekirda@FreeBSD.org)
Date: Sun, 25 May 2014 21:25:51 GMT
Message-Id: <201405252125.s4PLPp1C011928@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: r268614 -
 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:25:52 -0000

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

Log:
  hostname 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:25:47 2014	(r268613)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun May 25 21:25:51 2014	(r268614)
@@ -41,14 +41,14 @@
 # PARTITIONS
 # DISTRIBUTIONS
 # BSDINSTALL_DISTDIR
-# HOSTNAME if not exist, from hostname -s
 # MIRROR if not exist - ftp://ftp.freebsd.org
 # RELDIR if not exist - releases
 # RELEASE if not exist - 10.0-RELEASE
-# KEYMAP	to TMPETC
+# HOSTNAME	to TMPETC if not exist, don't set
+# KEYMAP	to TMPETC if not exist, don't set
 # TIMEZONE	to TMPETC
 
-# TODO: ADD VARIABLES: (hostname, keymap, services, docinstall, add other mirror)
+# TODO: ADD VARIABLES: (hostname, timezone, services, docinstall, add other mirror)
 
 ############################################################ GLOBALS
 
@@ -117,10 +117,16 @@
 BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/`uname -m`/`uname -p`/$RELEASE"
 export BSDINSTALL_DISTSITE
 
+# Hostname
+
+if [ -n $HOSTNAME ]; then
+	echo "hostname=\"$HOSTNAME\"" >> $BSDINSTALL_TMPETC/rc.conf.hostname
+fi
+
 # Add Keymap to setup script
 
 if [ -n $KEYMAP ]; then
-        echo "keymep=$KEYMAP" >> $BSDINSTALL_TMPETC/rc.conf.keymap
+        echo "keymap=\"$KEYMAP\"" >> $BSDINSTALL_TMPETC/rc.conf.keymap
 fi
 
 # Make partitions