From 26b142d2d4acc58017e15a4b678db9a21385b4cd Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 21 Sep 2018 02:11:58 -0400 Subject: [PATCH] Fix issue 5649: makedhcp misleading error message --- xCAT-server/lib/xcat/plugins/dhcp.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm index 3a4a9f2af..cfe1d978b 100644 --- a/xCAT-server/lib/xcat/plugins/dhcp.pm +++ b/xCAT-server/lib/xcat/plugins/dhcp.pm @@ -538,19 +538,19 @@ sub addnode unless ($nxtsrvd[0]) { $nxtsrv = $nxtsrvd[1]; } elsif ($nxtsrvd[0] == 1) { $callback->({ error => [ $nxtsrvd[1] ] }); } else { - $callback->({ error => ["Unable to determine the tftpserver for $node"], errorcode => [1] }); + $callback->({ error => ["Unable to determine the tftpserver for $node, please makesure \"xcatmaster\" is set correctly"], errorcode => [1] }); return; } } else { my $tmp_server = inet_aton($node_server); unless ($tmp_server) { - $callback->({ error => ["Unable to resolve the tftpserver for $node"], errorcode => [1] }); + $callback->({ error => ["Unable to determine the tftpserver for $node, please makesure \"xcatmaster\" is set correctly"], errorcode => [1] }); return; } $nxtsrv = inet_ntoa($tmp_server); } unless ($nxtsrv) { - $callback->({ error => ["Unable to determine the tftpserver for $node"], errorcode => [1] }); + $callback->({ error => ["Unable to determine the tftpserver for $node, please makesure \"xcatmaster\" is set correctly"], errorcode => [1] }); return; } $guess_next_server = 0;