xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3915 from xuweibj/genesis_check

Browse Source 
Delete genesis base built check in xcatprobe discovery pre-check
This commit is contained in:
zet809 2017-09-14 14:10:44 +08:00 committed by GitHub
commit 1979118d9b
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-probe/subcmds/discovery
View File

@ -524,7 +524,6 @@ sub check_genesis_file {
my $rst = 0;
my @warn_msg;
my $genesis_v;
my $os = probe_utils->get_os();
if ($os =~ "unknown") {
probe_utils->send_msg("stdout", "f", $msg);
@ -540,7 +539,6 @@ sub check_genesis_file {
probe_utils->send_msg("stdout", "d", "xCAT-genesis is not installed.");
return 1;
}
$genesis_v = `dpkg -s xcat-genesis-base-ppc64`;
} else {
my $genesis_output = `rpm -qa | grep -i "xcat-genesis"`;
unless (($genesis_output =~ /base/ and $genesis_output =~ /ppc64/) and
@ -551,15 +549,6 @@ sub check_genesis_file {
probe_utils->send_msg("stdout", "d", "xCAT-genesis is not installed.");
return 1;
}
$genesis_v = `rpm -qi xCAT-genesis-base-ppc64`;
}
if ($genesis_v =~ /Built in environment .+fc(\d*).+ on (.+)\./) {
my $ver = $1;
my $arch = $2;
push @warn_msg, "xcat-genesis-base-ppc64 is not built in environment fedora 26 or higher version on $arch." if ($ver < 26);
} else {
push @warn_msg, "xcat-genesis-base-ppc64 is not built in environment fedora.";
}
my $genesis_update_flag_p;