xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT-server/lib/xcat/plugins/dhcp.pm

Browse Source
This commit is contained in:
GONG Jie 2017-12-31 23:59:59 +00:00
parent 168b501c56
commit 38cd104958
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,7 +532,7 @@ sub addnode
my $node_server = undef;
if ($nrent->{xcatmaster}) {
$node_server = $nrent->{xcatmaster};
}
}
unless ($node_server) {
my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($node);
unless ($nxtsrvd[0]) { $nxtsrv = $nxtsrvd[1]; }
@ -717,7 +717,7 @@ sub addnode
$lstatements = 'if substring (option vendor-class-identifier,0,11) = \"onie_vendor\" { option www-server = \"http://' . $nxtsrv . $mypkgdir . '\";}' . $lstatements;
$validpkgdir = 1;
last;
}
}
}
unless ($validpkgdir) {
$callback->({ warning => ["osimage $provmethod pkgdir doesn't exists"]});
@ -728,7 +728,7 @@ sub addnode
} else {
$callback->({ warning => ["provmethod is not defined for $node"]});
}
} elsif ($nrent and $nrent->{netboot} and $nrent->{netboot} eq 'nimol') {
$lstatements = 'supersede server.filename=\"/vios/nodes/' . $node . '\";' . $lstatements;
}
@ -1289,7 +1289,7 @@ sub preprocess_request
$req->{'node'} = \@nodes;
$req->{_xcatpreprocessed}->[0] = 1;
@requests = ({%$req}); #Start with a straight copy to reflect local instance
# if not localonly - get list of service nodes and create requests
unless ($localonly || $hasHierarchy == 0) {
@ -1666,7 +1666,7 @@ sub process_request
#TODO: filter out multicast? Don't know if multicast groups *can* appear in ip -6 route...
#ignore link-local, global-local, junk, and routed networks
if (/^default/ or /^fe80::\/64/ or /^2002::\/64/ or /^unreachable/ or /^[^ ]+ via/) {
if (/^default/ or /^fe80::\/64/ or /^2002::\/64/ or /^unreachable/ or /^[^ ]+ via/) {
next;
}
my @parts = split /\s+/;
@ -1972,7 +1972,7 @@ sub process_request
$callback->({ error => [ "above error fail to generate new dhcp configuration file, restore dhcp configuration file $dhcpconffile" ], errorcode => [1] });
my $backupfile = $dhcpconffile.".xcatbak";
rename("$backupfile", $dhcpconffile);
xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: Restore dhcp configuration file to $dhcpconffile");
xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: Restore dhcp configuration file to $dhcpconffile");
exit 1;
}
foreach (@nrn6) { #do the ipv6 networks
@ -2340,7 +2340,7 @@ sub addnet6
push @netent, " option domain-search $domainstring;\n";
}
}
my $nameservers = $netcfgs{$net}->{nameservers};
if ($nameservers and $nameservers =~ /:/) {
@ -2569,7 +2569,7 @@ sub addnet
);
}
if ($ent and $ent->{mtu})
{
{
$mtu = $ent->{mtu};
}
}