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

Merge pull request #6150 from robin2008/6145

Browse Source 
Avoid noisy warning message on rh8 for makegocons
This commit is contained in:
zet809
2019-03-21 16:59:53 +08:00
committed by GitHub
parent efd954b36f 0ff9bc0be5
commit d4d4a0c1b5
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-server/lib/perl/xCAT/Goconserver.pm
View File

@ -503,11 +503,13 @@ sub is_goconserver_running {
sub switch_goconserver {
my $callback = shift;
# ignore SN as it is handled by AAsn
if ((-x "/usr/bin/systemctl" || -x "-x /bin/systemctl") && !$isSN) {
if ((-x "/usr/bin/systemctl" || -x "/bin/systemctl") && !$isSN) {
my $cmd = "systemctl disable conserver";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->warn_message("Failed to execute command: $cmd.", $callback);
if (-x "/usr/sbin/conserver") {
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->warn_message("Failed to execute command: $cmd.", $callback);
}
}
$cmd = "systemctl enable goconserver";
xCAT::Utils->runcmd($cmd, -1);
@ -537,9 +539,11 @@ sub switch_conserver {
# ignore SN as it is handled by AAsn
if ((-x "/usr/bin/systemctl" || -x "-x /bin/systemctl") && !$isSN) {
my $cmd = "systemctl disable goconserver";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->warn_message("Failed to execute command: $cmd.", $callback);
if (-x "/usr/bin/goconserver") {
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->warn_message("Failed to execute command: $cmd.", $callback);
}
}
$cmd = "systemctl enable conserver";
xCAT::Utils->runcmd($cmd, -1);