xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Restore backwards compatibility to !remote!

Browse Source 
A change was made to allow '!remote!' to force indicate a NIC to be
relevant in case it wouldn't naturally occur.  This broke existing
configurations where the NIC would naturally be 'active'.  Attempt
to address by restoring the old match and enabling the new code
when an interface name is detected after '!remote!', but otherwise
act like pre-2.9.1 dhcp.pm
This commit is contained in:
jjohnson2 2015-04-29 15:01:25 -04:00
parent 75a7490d98
commit ae5715849f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1450,7 +1450,7 @@ sub process_request
my $n = $_->{net};
my $if = $_->{mgtifname};
my $nm = $_->{mask};
if ($if =~ /!remote!\S+/ and $n !~ /:/) { #only take in networks with special interface, but only v4 for now
if ($if =~ /!remote!/ and $n !~ /:/) { #only take in networks with special interface, but only v4 for now
push @nrn, "$n:$if:$nm";
}
}
@ -1468,7 +1468,7 @@ sub process_request
next;
}
my $netif = $ent[1];
if ($netif =~ /!remote!/) {
if ($netif =~ /!remote!\S+/) {
$netif =~ s/!remote!\s*(.*)$/$1/;
}
# Bridge nics
@ -1708,7 +1708,7 @@ sub process_request
next;
}
my $netif = $line[1];
if ($netif =~ /!remote!/) {
if ($netif =~ /!remote!\S+/) {
$netif =~ s/!remote!\s*(.*)$/$1/;
if (!defined($activenics{"!remote!"})) {
next;
@ -2141,7 +2141,7 @@ sub addnet
if ($ent[0] eq $net and $ent[2] eq $mask)
{
$nic = $ent[1];
if ($nic =~ /!remote!/) {
if ($nic =~ /!remote!\S+/) {
$nic =~ s/!remote!\s*(.*)$/$1/;
}
# The first nic that matches the network,