From 6b6b44b04e34d71f4d76e953d288a4a803da4c84 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 22 Aug 2012 19:09:26 +0000
Subject: [PATCH] fix for vlan

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13579 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Postage.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 777a7bedf..b9b90afc7 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -205,6 +205,7 @@ sub makescript
         push @scriptd, "export ENABLESSHBETWEENNODES\n";
     }      
 
+    #$masterset =1; ###REMOVE
     if ($masterset == 0)
     {
         my %rsp;
@@ -370,16 +371,17 @@ sub makescript
 
     #get vlan related items
     my $module_name="xCAT_plugin::vlan";
-    my @tmp_scriptd=();
     eval("use $module_name;");
     if (!$@) {
-      no strict  "refs";
-      if (defined(${$module_name."::"}{getNodeVlanConfData})) {
-	  @tmp_scriptd=${$module_name."::"}{getNodeVlanConfData}->($node);
-      }  
+	no strict  "refs";
+	if (defined(${$module_name."::"}{getNodeVlanConfData})) {
+	    my @tmp_scriptd=${$module_name."::"}{getNodeVlanConfData}->($node);
+	    #print Dumper(@tmp_scriptd);
+	    if (@tmp_scriptd > 0) {
+		@scriptd=(@scriptd,@tmp_scriptd);
+	    }
+	}  
     }
-    @scriptd=(@scriptd,@tmp_scriptd);
-    #print Dumper(@tmp_scriptd);
 
 
     #get monitoring server and other configuration data for monitoring setup on nodes