do not restart the mpsk daemon upon cfg reload

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2024-10-01 10:07:25 +02:00
parent baeef766f4
commit df95905c2d
3 changed files with 10 additions and 1 deletions

View File

@@ -671,6 +671,8 @@ let services = {
if (!this.state[name]) {
if (state == 'early')
this.state[name] = 'early';
else if (state == 'no-restart')
this.state[name] = 'no-restart';
else
this.state[name] = state ? true : false;
}

View File

@@ -1,3 +1,3 @@
{%
services.set_enabled("mpskd", services.lookup_ssids_by_mpsk());
services.set_enabled("mpskd", services.lookup_ssids_by_mpsk() ? 'no-restart' : false);
%}

View File

@@ -18,9 +18,15 @@ inputfile.close();
let logs = [];
function set_service_state(state) {
let services = ubus.call('service', 'list');
for (let service, enable in renderer.services_state()) {
if (enable != state)
continue;
if (enable == 'no-restart')
if (services[service] && services[service]?.instances[service]?.running) {
printf("%s is already running\n", service);
continue;
}
printf("%s %s\n", service, enable ? "starting" : "stopping");
system(sprintf("/etc/init.d/%s %s", service, (enable || enable == 'early') ? "restart" : "stop"));
}
@@ -95,6 +101,7 @@ try {
}
set_service_state(true);
set_service_state('no-restart');
ubus.call('mpsk', 'flush');
} else {
error = 1;