mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-11-04 05:12:30 +00:00 
			
		
		
		
	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
This commit is contained in:
		@@ -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"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user