From abeffffccfa87c48404d19c93cdbe2e259867713 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 8 Mar 2012 13:43:10 +0000
Subject: [PATCH] fix statelite and mkdsklsnode node issue

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@11796 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/aixinstall.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index d8953d30d..b02af8be7 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -6561,9 +6561,12 @@ sub update_dd_boot
 			cp /SPOT/usr/bin/cat /usr/bin
 			cp /SPOT/usr/bin/awk /usr/bin
 			cp /SPOT/usr/bin/grep /usr/bin
+			cp /SPOT/usr/bin/cut  /usr/bin
+
+			SHOST=`echo \${NIM_HOSTNAME} | /usr/bin/cut -d . -f 1`
 
 			# statelite entry for this node
-			SLLINE=`/usr/bin/cat /mnt/statelite.table | /usr/bin/grep \${NIM_NAME}`
+			SLLINE=`/usr/bin/cat /mnt/statelite.table | /usr/bin/grep \${SHOST}`
 			# the statelite server
 			SLSERV=`echo \$SLLINE | /usr/bin/awk -F'|' '{print \$2}'`
 
@@ -6573,8 +6576,8 @@ sub update_dd_boot
 			mount \${SLSERV}:\${SLDIR} /tmp
 
 			# - get the persistent version of basecust from the server
-			if [ -f /tmp/\${NIM_NAME}/etc/basecust  ]; then
-				cp -p /tmp/\${NIM_NAME}/etc/basecust /etc
+			if [ -f /tmp/\${SHOST}/etc/basecust  ]; then
+				cp -p /tmp/\${SHOST}/etc/basecust /etc
 				cp /SPOT/usr/lib/boot/restbase /usr/sbin
 				cp /SPOT/usr/bin/uncompress /usr/bin
 			fi
@@ -6593,7 +6596,9 @@ sub update_dd_boot
 			# need to mount persistent basecust over the one in RAM FS
 			mount -o rw \${SLSERV}:\${SLDIR} /tmp
 			/usr/bin/touch /etc/basecust
-			mount /tmp/\${NIM_NAME}/etc/basecust /etc/basecust
+			cp /SPOT/usr/bin/cut  /usr/bin
+			SHOST=`echo \${NIM_HOSTNAME} | /usr/bin/cut -d . -f 1`
+			mount /tmp/\${SHOST}/etc/basecust /etc/basecust
 		fi
 	fi \n\n~;