From 4e0fb1ef69c53a90f84f08d7e6454c9a512f821f Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 12 Mar 2009 19:44:45 +0000
Subject: [PATCH] minor fix

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2884 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Postage.pm  | 10 +++-------
 xCAT/postscripts/otherpkgs |  4 +++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/Postage.pm b/perl-xCAT/xCAT/Postage.pm
index 9d237265d..d253115a8 100644
--- a/perl-xCAT/xCAT/Postage.pm
+++ b/perl-xCAT/xCAT/Postage.pm
@@ -133,15 +133,11 @@ sub makescript {
          push @scriptd, "SITEMASTER=".$value."\n";
          push @scriptd, "export SITEMASTER\n";
          # if node has service node as master then override site master
-         my $et = $noderestab->getNodeAttribs($node,['xcatmaster', 'servicenode']);
+         my $et = $noderestab->getNodeAttribs($node,['xcatmaster']);
          if ($et and defined($et->{'xcatmaster'})) { 
            $value = $et->{'xcatmaster'};
-         } 
-	 if ($et and defined($et->{'servicenode'})) { 
-	     my $tmp = $et->{'servicenode'};
-	     if ($tmp =~ /,/) { #service node pool case,use local host as the master
-		 $value=xCAT::Utils->getFacingIP($node); 
-	     }
+         } else {
+	     $value=xCAT::Utils->getFacingIP($node); 
 	 }
          push @scriptd, "$attribute=".$value."\n";
          push @scriptd, "export $attribute\n";
diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs
index 300c0fb43..4cc794877 100755
--- a/xCAT/postscripts/otherpkgs
+++ b/xCAT/postscripts/otherpkgs
@@ -39,7 +39,9 @@ fi
 #    SIP=`echo $SIP |awk -F\' '{print $2}'` #trim '
 #fi
 
-
+if [[ -z "$NFSSERVER" ]]; then
+    NFSSERVER=$MASTER
+fi
 
   if [[ $OTHERPKGS_HASREPO -eq 1 ]]; then
     rpm -q yum