From 7de70f40be11d9747338246942aa8dd8822f6fc5 Mon Sep 17 00:00:00 2001 From: mellor Date: Mon, 1 Feb 2010 20:54:52 +0000 Subject: [PATCH] set postscript var MASTER to SITEMASTER if no xcatmaster, no servicenode, and no getFacingIP (i.e. node not on local subnet) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5112 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Postage.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index ee8488057..395d5f558 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -140,7 +140,11 @@ sub makescript { if ($et and defined($et->{'xcatmaster'})) { $value = $et->{'xcatmaster'}; } else { + my $sitemaster_value = $value; $value=xCAT::Utils->getFacingIP($node); + if ($value eq "0") { + $value = $sitemaster_value; + } } push @scriptd, "$attribute=".$value."\n"; push @scriptd, "export $attribute\n";