diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index d561e73..c7ee8f7 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -650,7 +650,7 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIocageRequest(const QJsonVal QJsonObject retObj; if(act=="activatepool"){ retObj = sysadm::Iocage::activatePool(in_args.toObject()); } else if(act=="deactivatepool"){retObj = sysadm::Iocage::deactivatePool(in_args.toObject()); } - + else if(act=="activatestatus"){ retObj = sysadm::Iocage::activateStatus(); } /*if(act=="execjail"){ ok = true; out->insert("execjail", sysadm::Iocage::execJail(in_args.toObject())); diff --git a/src/server/library/sysadm-iocage.cpp b/src/server/library/sysadm-iocage.cpp index d0f16f9..b3756e9 100644 --- a/src/server/library/sysadm-iocage.cpp +++ b/src/server/library/sysadm-iocage.cpp @@ -14,15 +14,14 @@ using namespace sysadm; // ============ GLOBAL OPTIONS ============== // Current activation status -// ##NOT-WORKING in 5/23/17 build of iocage (0.9.8.1)## QJsonObject Iocage::activateStatus(){ QJsonObject retObject; bool success = false; - QString output = General::RunCommand(success, "iocage activate --status"); + QStringList info = General::RunCommand(success, "iocage get -p").split("\n"); retObject.insert("activated", success ? "true" : "false"); if(success){ //Grab the currently activated pool out of the return, and list that - QString pool = output.simplified(); + QString pool = info.last().simplified(); retObject.insert("pool", pool); } return retObject;