From 52fdb2a246905066e13f0ac76dddbf8cdcc52ad6 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 19 Aug 2010 15:27:30 +0000
Subject: [PATCH] `hostname -s` will not work on boot for SUSE nodes.  Added
 conditional statement to use `hostname` if it is a SUSE node.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7150 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../netboot/add-on/statelite/rc.statelite     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
index 856b0e2bc..83997adf9 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
@@ -9,12 +9,10 @@
 # get all the database files.
 #set -x
 SL=".statelite"
-ME=`hostname -s`
 MNTDIR="/sysroot"
 SYNCTREE="${MNTDIR}/$SL/litetree" 	# the list of directories to sync from
 SYNCLIST="${MNTDIR}/$SL/litefile" 	# the list of files to sync
 TREEMOUNT="${MNTDIR}/$SL/mnt"  	# where I mount all the trees.
-PERSISTENT="${MNTDIR}/$SL/persistent/$ME"
 TMPFS="${MNTDIR}/$SL/tmpfs"
 DEFAULT="${MNTDIR}/.default"
 LOG="${MNTDIR}/${SL}/statelite.log"
@@ -22,6 +20,16 @@ ELIST=[]    # entry list, each entry will contain the type and the path
 declare -a CLIST 
 declare -a PLIST 
 
+# hostname -s does not work on boot for SUSE
+# You get this error: 
+# 	hostname: Unknown server error
+if [ -e "${MNTDIR}/etc/SuSE-release" ]; then
+	ME=`hostname`
+else
+	ME=`hostname -s`
+fi
+
+PERSISTENT="${MNTDIR}/$SL/persistent/$ME"
 
 if [ ! -d $MNTDIR ]; then
 	echo "statelite is only to be run in initrdfs"
@@ -53,8 +61,14 @@ GetSyncInfo () {
 		fi
 	done
 
-    hn=`hostname -s`
-	
+	# hostname -s does not work on boot for SUSE
+	# You get this error: 
+	# 	hostname: Unknown server error
+    if [ -e "${MNTDIR}/etc/SuSE-release" ]; then
+		hn=`hostname`
+	else
+		hn=`hostname -s`
+	fi
 
 	if [ -z $XCATSERVER ]; then
 		echo "Cannot find the xCAT server for node $hn"