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

-Have dhcp/networks table not automatically pick up multicast networks

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1539 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-06-02 12:00:46 +00:00
parent c5ddec8e38
commit eb5c7ca792
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,7 +379,9 @@ sub process_request
foreach (@nrn)
{
my @ent = split /\s+/;
if ($ent[0] eq "169.254.0.0")
my $firstoctet = $ent[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($ent[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}
@ -463,7 +465,9 @@ sub process_request
foreach (@nrn)
{
my @line = split /\s+/;
if ($ent[0] eq "169.254.0.0")
my $firstoctet = $line[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($line[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}
@ -484,7 +488,9 @@ sub addnet
my $net = shift;
my $mask = shift;
my $nic;
if ($net eq "169.254.0.0") {
my $firstoctet = $net;
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($net eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239)) {
return;
}
unless (grep /\} # $net\/$mask subnet_end/, @dhcpconf)
@ -493,7 +499,9 @@ sub addnet
foreach (@nrn)
{ # search for relevant NIC
my @ent = split /\s+/;
if ($ent[0] eq "169.254.0.0")
$firstoctet = $ent[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($ent[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}

4
xCAT-server-2.0/lib/xcat/plugins/networks.pm
View File

@ -58,7 +58,9 @@ sub process_request
my $mgtifname;
my $gw;
my @ent = split /\s+/, $_;
if ($ent[0] eq "169.254.0.0")
my $firstoctet = $ent[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($ent[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}