xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 02:30:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3805 from immarvin/onissue

Browse Source 
fix issue [FVT]:nodeset against diskless osimage output is not consistent on rhels and sles/ubuntu #3783
This commit is contained in:
Yuan Bai
2017-08-29 16:55:56 +08:00
committed by GitHub
parent 2dd9677193 2f609bdb8a
commit 5cf2263414
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -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;