From 84cbeb2eb42dc382c91bb062082f8944369b4516 Mon Sep 17 00:00:00 2001 From: vallard Date: Wed, 20 Jan 2010 02:14:46 +0000 Subject: [PATCH] updated to fix xnba problems git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4985 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Utils.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 48bc7f738..97d7ff713 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -2204,20 +2204,24 @@ sub my_nets $rethash->{$textnet} = $curnet; } - + # now get remote nets my $nettab = xCAT::Table->new("networks"); + my $sitetab = xCAT::Table->new("site"); + my $master = $sitetab->getAttribs({key=>'master'},'value'); + $master = $master->{value}; my @vnets = $nettab->getAllAttribs('net','mgtifname','mask'); + foreach(@vnets){ my $n = $_->{net}; my $if = $_->{mgtifname}; - my $nm = $_->{mask}; + my $nm = $_->{mask}; if ($if =~ /!remote!/) { #only take in networks with special interface $nm = formatNetmask($nm, 0 , 1); - $n .="/$nm"; - $rethash->{$n} = $if; - } + $n .="/$nm"; + #$rethash->{$n} = $if; + $rethash->{$n} = $master; + } } - return $rethash; } #-------------------------------------------------------------------------------