[Fai-commit] r4341 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-13 20:04:00 +0000 (Wed, 13 Jun 2007)
New Revision: 4341

Modified:
   trunk/bin/fai
   trunk/bin/fai-class
Log:
remove HOST variable, only use HOSTNAME now


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2007-06-13 17:56:03 UTC (rev 4340)
+++ trunk/bin/fai	2007-06-13 20:04:00 UTC (rev 4341)
@@ -82,7 +82,6 @@
 
     if [ X$action = Xdirinstall -a -n "$newhostname" ]; then
 	HOSTNAME=$newhostname
-	HOST=$newhostname
 	unset newhostname
 	echo "Hostname set to $HOST" | tee -a $LOGDIR/fai.log
     fi
@@ -95,13 +94,6 @@
 
     if [ $do_init_tasks -eq 1 ]; then
 	eval_cmdline
-	# if HOST was specified on the commandline, set hostname to it
-	if [ -n "$HOST" ]; then
-	    HOSTNAME=$HOST
-	    hostname $HOST
-	    echo "Hostname set to $HOST" | tee -a $LOGDIR/fai.log
-	fi
-
 	mount -t sysfs sysfs /sys
 	# we really need to start udev
 	[ -x /etc/init.d/udev ] && /etc/init.d/udev start

Modified: trunk/bin/fai-class
===================================================================
--- trunk/bin/fai-class	2007-06-13 17:56:03 UTC (rev 4340)
+++ trunk/bin/fai-class	2007-06-13 20:04:00 UTC (rev 4341)
@@ -27,7 +27,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="version 1.5.4, 23-jan-2007"
+version="version 1.5.5, 13-jun-2007"
 
 # import variables: $LOGDIR $verbose $debug
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -131,11 +131,7 @@
 	verbosemsg "Setting LOGDIR to default value /tmp/fai"
 	LOGDIR=/tmp/fai; export LOGDIR
     fi
-    if [ -n "$HOST" ]; then
-	export HOSTNAME=$HOST
-    else
-	HOSTNAME=$(uname -n | cut -d. -f1); export HOSTNAME
-    fi
+    HOSTNAME=$(uname -n | cut -d. -f1); export HOSTNAME
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main program