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