From 2f609bdb8af439e0d405e64c9d36be1c9188c646 Mon Sep 17 00:00:00 2001 From: immarvin Date: Tue, 29 Aug 2017 02:46:13 -0400 Subject: [PATCH] fix issue [FVT]:nodeset against diskless osimage output is not consistent on rhels and sles/ubuntu #3783 --- xCAT-server/lib/xcat/plugins/sles.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index f69689a1e..d367e07cf 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -100,6 +100,8 @@ sub mknetboot $nodestatus = $t_entry; } + my @myself = xCAT::NetworkUtils->determinehostname(); + my $myname = $myself[ (scalar @myself) - 1 ]; #} my $ntents = $ostab->getNodesAttribs($req->{node}, [ 'os', 'arch', 'profile', 'provmethod' ]); @@ -333,7 +335,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; @@ -362,7 +364,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;