xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 11:12:04 +00:00
Code Issues Releases Wiki Activity

Error message if running kits on rhel8

Browse Source
This commit is contained in:
cxhong 2019-10-28 14:33:54 -04:00
parent 3a67fdf736
commit d034005e81
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-buildkit/bin/buildkit
View File

@ -344,6 +344,13 @@ if ($tempstring =~ /debian/ || $tempstring =~ /ubuntu/) {
$debianflag = 1;
}
my ($sysos, $sysver) = split /,/, $tempstring;
if ( ($sysos =~ /rh/) && ($sysver ge 8) ) {
print "ERROR: KITs are not supported on rhel8 or above\n";
exit(1);
}
# This is an undocumented flag to support our local build team
# to allow building Ubuntu kits on our RH build machines.
# It requires RH rpms such as dep, fakeroot, perl-File-DesktopEntry,

8
xCAT-server/lib/xcat/plugins/kit.pm
View File

@ -33,7 +33,7 @@ $::KITFRAMEWORK = "2";
$::COMPATIBLE_KITFRAMEWORKS = "0,1,2";
my $debianflag = 0;
my $tempstring = xCAT::Utils->osver();
my $tempstring = xCAT::Utils->osver(all);
if ($tempstring =~ /debian/ || $tempstring =~ /ubuntu/) {
$debianflag = 1;
@ -99,6 +99,12 @@ sub process_request
$::PID = $$;
}
my ($sysos, $sysver) = split /,/, $tempstring;
if ( ($sysos =~ /rh/) && ($sysver ge 8) ) {
$callback->({ error => ["KITs are not supported on rhel8 or above"], errorcode => [1] });
return 1;
}
my $command = $request->{command}->[0];
my $rc;