From e7e18f46b63c9172241b1640042e46bfb5c9abbc Mon Sep 17 00:00:00 2001 From: immarvin Date: Mon, 28 Aug 2017 04:21:49 -0400 Subject: [PATCH] fix issue [FVT]:rmimage output is not consistent on rhels and sles/ubuntu #3783 --- xCAT-server/lib/xcat/plugins/debian.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 8260874ea..374c37067 100644 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -957,6 +957,8 @@ sub mknetboot my $xcatdport = "3001"; my $xcatiport = "3002"; my $nodestatus = "y"; + my @myself = xCAT::NetworkUtils->determinehostname(); + my $myname = $myself[ (scalar @myself) - 1 ]; if ($sitetab) { @@ -1170,7 +1172,7 @@ sub mknetboot if ($statelite) { unless (-r "$rootimgdir/kernel") { $callback->({ - error => [qq{Did you run "genimage" before running "liteimg"? kernel cannot be found...}], + error => [qq{Did you run "genimage" before running "liteimg"? kernel cannot be found at $rootimgdir/kernel on $myname}], errorcode => [1] }); next; @@ -1197,7 +1199,7 @@ sub mknetboot } else { unless (-r "$rootimgdir/kernel") { $callback->({ - error => [qq{Did you run "genimage" before running "packimage"? kernel cannot be found}], + error => [qq{Did you run "genimage" before running "packimage"? kernel cannot be found at $rootimgdir/kernel on $myname}], errorcode => [1] }); next;