From f083db0faf5e258a60cd44784d8217c46c4b581a Mon Sep 17 00:00:00 2001 From: nott Date: Wed, 26 May 2010 17:26:56 +0000 Subject: [PATCH] use correct values in call to NetworkUtils->ishostinsubnet git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6247 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/xcat2nim.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/xcat2nim.pm b/xCAT-server/lib/xcat/plugins/xcat2nim.pm index 39073e2c2..e4b6ff9ff 100644 --- a/xCAT-server/lib/xcat/plugins/xcat2nim.pm +++ b/xCAT-server/lib/xcat/plugins/xcat2nim.pm @@ -1493,15 +1493,15 @@ sub mkNIMnetwork foreach my $int (@result) { my ($inet, $myIP, $str) = split(" ", $int); chomp $myIP; - $myIP =~ s/\/.*//; # ipv6 address 4000::99/64 - $myIP =~ s/\%.*//; # ipv6 address ::1%1/128 + $myIP =~ s/\/.*//; # ipv6 address 4000::99/64 + $myIP =~ s/\%.*//; # ipv6 address ::1%1/128 - # if the ip address is in the subnet - # the right interface - if ( xCAT::NetworkUtils->ishostinsubnet($myIP, $nethash{$node}{mask}, $nethash{$node}{net} )) { - $adapterhostname = xCAT::NetworkUtils->gethostname($myIP); - last; - } + # if the ip address is in the subnet + # the right interface + if ( xCAT::NetworkUtils->ishostinsubnet($myIP, $xnethash{$net}{mask}, $xnethash{$net}{net} )) { + $adapterhostname = xCAT::NetworkUtils->gethostname($myIP); + last; + } } # define the new interface