diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm index de5a3966b..2f699c8fa 100755 --- a/perl-xCAT/xCAT/NetworkUtils.pm +++ b/perl-xCAT/xCAT/NetworkUtils.pm @@ -1097,7 +1097,7 @@ sub my_if_netmap 1. If node can not be resolved, the return info will be like this: [1, "The $node can not be resolved"]. 2. If no IP found that matching the giving node, the return info will be: - [2, "No found matching IP for $node"]. + [2, "The IP address of node $node is in an undefined subnet"]. 3. If IP found: [0,ip1,ip2,...] Globals: @@ -1151,7 +1151,7 @@ sub my_ip_facing push @rst, @ips; } else { $rst[0] = 2; - $rst[1] = "No found matching IP for $peer"; + $rst[1] = "The IP address of node $peer is in an undefined subnet"; } return @rst; } @@ -1209,7 +1209,7 @@ sub my_ip_facing_aix else { $rst[0] = 2; - $rst[1] = "No found matching IP for $peer"; + $rst[1] = "The IP address of node $peer is in an undefined subnet"; } return @rst; } diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm index d7e9bd77c..e0bf2b70f 100644 --- a/xCAT-server/lib/xcat/plugins/grub2.pm +++ b/xCAT-server/lib/xcat/plugins/grub2.pm @@ -119,7 +119,7 @@ sub setstate { $::callback->( { error => [ - "$myname: Unable to determine the image server for $node on service node $sn" + "$myname: $ipfnd[1] on service node $sn" ], errorcode => [1] } @@ -131,7 +131,7 @@ sub setstate { $::callback->( { error => [ - "$myname: Unable to determine the image server for $node" + "$myname: $ipfnd[1]" ], errorcode => [1] } diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm index 4a09972d6..8e082dd95 100644 --- a/xCAT-server/lib/xcat/plugins/petitboot.pm +++ b/xCAT-server/lib/xcat/plugins/petitboot.pm @@ -122,7 +122,7 @@ sub setstate { $::callback->( { error => [ - "$myname: Unable to determine the image server for $node on service node $sn" + "$myname: $ipfnd[1] on service node $sn" ], errorcode => [1] } @@ -134,7 +134,7 @@ sub setstate { $::callback->( { error => [ - "$myname: Unable to determine the image server for $node" + "$myname: $ipfnd[1]" ], errorcode => [1] } diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm index c77ebb2ea..7ba9458f4 100644 --- a/xCAT-server/lib/xcat/plugins/yaboot.pm +++ b/xCAT-server/lib/xcat/plugins/yaboot.pm @@ -114,7 +114,7 @@ sub setstate { $::YABOOT_callback->( { error => [ - "$myname: Unable to determine the image server for $node on service node $sn" + "$myname: $ipfnd[1] on service node $sn" ], errorcode => [1] } @@ -126,7 +126,7 @@ sub setstate { $::YABOOT_callback->( { error => [ - "$myname: Unable to determine the image server for $node" + "$myname: $ipfnd[1]" ], errorcode => [1] }