arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Fix problem where gatewayed networks were processed by default

Browse Source 
-Fix problem where noderanges in dhcpinterfaces would not be effective


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3016 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2009-03-27 15:13:25 +00:00
parent 1f3f60f74f
commit 837c6ec620
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -356,23 +356,27 @@ sub process_request
INTF: foreach $dhcpif (split /;/,$dhcpinterfaces) {
my $host;
my $savehost;
my $foundself;
if ($dhcpif =~ /\|/) {
(my $ngroup,$dhcpif) = split /\|/,$dhcpif;
foreach $host (noderange($ngroup)) {
$savehost=$host;
if (xCAT::Utils->thishostisnot($host)) {
next INTF;
unless (xCAT::Utils->thishostisnot($host)) {
$foundself=1;
last;
}
}
if (!defined($savehost)) { # host not defined in db,
# probably management node
if (xCAT::Utils->thishostisnot($ngroup)) {
next INTF;
unless (xCAT::Utils->thishostisnot($ngroup)) {
$foundself=1;
}
}
}
unless ($foundself) {
next INTF;
}
foreach (split /[,\s]+/, $dhcpif)
{
$activenics{$_} = 1;
@@ -474,7 +478,7 @@ sub process_request
splice @nsrnoutput, 0, 2;
foreach (@nsrnoutput) { #scan netstat
my @parts = split /\s+/;
push @nrn,$parts[0].":".$parts[7].":".$parts[2],":",$parts[3];
push @nrn,$parts[0].":".$parts[7].":".$parts[2].":".$parts[3];
}
foreach(@vnets){