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

Merge pull request #1492 from xuweibj/noip

Browse Source 
fix bug, update ipnodemap
This commit is contained in:
Xiaopeng Wang 2016-07-07 11:04:13 +08:00 committed by GitHub
commit e06a7c6c36
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-probe/subcmds/osdeploy
View File

@ -144,9 +144,7 @@ sub handle_dhcp_msg {
my $record = "Send DHCPACK on $ip back to [$node] $mac via $nic";
probe_utils->send_msg("$output", "d", "$record");
push(@{ $rawdata{$node}{"history"} }, $record);
if ($macmap{$mac}{"ip"} != "NOIP") {
$ipnodemap{$ip} = $node;
}
$ipnodemap{$ip} = $node;
}
} elsif ($msg =~ /.+BOOTREQUEST\s+from\s+(.+)\s+via\s+([^:]+)(.*)/) {
my $mac = $1;
@ -168,9 +166,7 @@ sub handle_dhcp_msg {
my $record = "Send BOOTREPLY on $ip back to [$node] $mac via $nic";
probe_utils->send_msg("$output", "d", "$record");
push(@{ $rawdata{$node}{"history"} }, $record);
if ($macmap{$mac}{"ip"} != "NOIP") {
$ipnodemap{$ip} = $node;
}
$ipnodemap{$ip} = $node;
if ($macmap{$mac}{"ip"} != "NOIP" and $macmap{$mac}{"ip"} != $ip) {
my $warn_msg = "The ip of [$node] $mac from DHCP $ip is different with definition $macmap{$mac}{'ip'}.";