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

[kczekirda at FreeBSD.org]

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