From d404462494bf56d6bcf1123f38b5643e4bb356bb Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 10 Oct 2012 15:28:30 +0000
Subject: [PATCH] modify rc.dd_boot setup

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 85ccba438..ff7a1a90b 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -7321,15 +7321,18 @@ sub update_dd_boot
 			# statelite directory to mount
 			SLDIR=`echo \$SLLINE | /usr/bin/awk -F'|' '{print \$3}'`
 
-			$::MOUNT \${SLSERV}:\${SLDIR} /tmp
+			cp /SPOT/usr/bin/mkdir /usr/bin
+			/usr/bin/mkdir -p /slmnt
+
+			$::MOUNT \${SLSERV}:\${SLDIR} /slmnt
 
 			# - get the persistent version of basecust from the server
-			if [ -f /tmp/\${SHOST}/etc/basecust  ]; then
-				cp -p /tmp/\${SHOST}/etc/basecust /etc
+			if [ -f /slmnt/\${SHOST}/etc/basecust  ]; then
+				cp -p /slmnt/\${SHOST}/etc/basecust /etc
 				cp /SPOT/usr/lib/boot/restbase /usr/sbin
 				cp /SPOT/usr/bin/uncompress /usr/bin
 			fi
-			umount /tmp
+			umount /slmnt
 		fi
 	fi
 			\n\n~;
@@ -7341,14 +7344,14 @@ sub update_dd_boot
 		# if we found a statelite directory - above
 		if [ -n "\${SLDIR}" ]
 		then
+			cp /SPOT/usr/bin/mkdir /usr/bin
+			/usr/bin/mkdir -p /slmnt
+			$::MOUNT -o rw \${SLSERV}:\${SLDIR} /slmnt
+			/usr/bin/touch /etc/basecust
+			SHOST=`echo \${NIM_HOSTNAME} | cut -d . -f 1`
 			# if we have a basecust file
-			if [ -f /tmp/\${SHOST}/etc/basecust  ]; then
+			if [ -f /slmnt/\${SHOST}/etc/basecust  ]; then
 				# need to mount persistent basecust to RAM FS
-				cp /SPOT/usr/bin/mkdir /usr/bin
-				/usr/bin/mkdir -p /slmnt
-				mount -o rw \${SLSERV}:\${SLDIR} /slmnt
-				/usr/bin/touch /etc/basecust
-				SHOST=`echo \${NIM_HOSTNAME} | cut -d . -f 1`
 				mount /slmnt/\${SHOST}/etc/basecust /etc/basecust
 			fi
 		fi
@@ -13879,7 +13882,7 @@ sub mknimimage_usage
       "\tmknimimage [-V] -u osimage_name [attr=val [attr=val ...]]";
     push @{$rsp->{data}}, "or";
     push @{$rsp->{data}},
-      "\tmknimimage [-V] [-f|--force] [-t nimtype] [-m nimmethod]\n\t\t[-c|--completeosimage] [-r|--sharedroot] [-D|--mkdumpres]\n\t\t[-l <location>] [-s image_source] [-i current_image]\n\t\t[-p|--cplpp] [-t nimtype] [-m nimmethod] [-n mksysbnode]\n\t\t[-b mksysbfile] osimage_name [attr=val [attr=val ...]]\n";
+      "\tmknimimage [-V] [-f|--force] [-t nimtype] [-m nimmethod]\n\t\t[-c|--completeosimage] [-r|--sharedroot] [-D|--mkdumpres]\n\t\t[-l <location>] [-s image_source] [-i current_image]\n\t\t[-p|--cplpp] [-n mksysbnode] [-b mksysbfile]\n\t\tosimage_name [attr=val [attr=val ...]]\n";
     xCAT::MsgUtils->message("I", $rsp, $callback);
     return 0;
 }