From b2280b469bce441bcc90a2491a506b89c16cc604 Mon Sep 17 00:00:00 2001 From: XuWei Date: Wed, 6 Jul 2016 22:43:05 -0400 Subject: [PATCH] fix bug, update ipnodemap --- xCAT-probe/subcmds/osdeploy | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xCAT-probe/subcmds/osdeploy b/xCAT-probe/subcmds/osdeploy index 644de4003..9cfecd7b7 100755 --- a/xCAT-probe/subcmds/osdeploy +++ b/xCAT-probe/subcmds/osdeploy @@ -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'}.";