2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00

Merge pull request #6180 from robin2008/mkconservercf

handle the case when conserver is not available
This commit is contained in:
Weihua Hu 2019-03-27 14:07:06 +08:00 committed by GitHub
commit 1bfb25b493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -212,10 +212,16 @@ sub process_request {
} else {
my $rsp->{data}->[0] = "makeconservercf is deprecrated as well as conserver, go to makegocons for more information about enabling goconserver.";
xCAT::MsgUtils->message("W", $rsp, $cb);
xCAT::Goconserver::switch_conserver($cb) if (-x "/usr/sbin/conserver");
}
xCAT::Goconserver::switch_conserver($cb);
}
makeconservercf($req, $cb);
if (-x "/usr/sbin/conserver") {
makeconservercf($req, $cb);
} else {
my $rsp->{data}->[0] = "conserver is not supported or not installed.";
xCAT::MsgUtils->message("E", $rsp, $cb);
return;
}
}
}