michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to preserve timesyncd and chronyd status.

Browse Source
This commit is contained in:
Ilia Ross
2023-11-14 17:32:48 +02:00
parent f555367eb4
commit b0b26f8663
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
time/time-lib.pl
View File

@@ -49,13 +49,21 @@ elsif (&has_command("sntp")) {
$out = &backquote_logged("sntp -s $servs 2>&1");
}
elsif (&has_command("chronyc")) {
my $chronyd_running = &init::status_action('chronyd');
$out = &backquote_logged("systemctl restart chronyd 2>&1");
$out .= &backquote_logged("chronyc makestep 2>&1");
sleep 5;
sleep ($chronyd_running ? 5 : 15);
if (!$chronyd_running) {
&backquote_logged("systemctl stop chronyd 2>&1");
}
}
elsif (&foreign_require('init') && init::action_status('systemd-timesyncd') == 2) {
elsif (&foreign_require('init') && &init::action_status('systemd-timesyncd') > 0) {
my $systemd_timesyncd_running = &init::status_action('systemd-timesyncd');
$out = &backquote_logged("systemctl restart systemd-timesyncd 2>&1");
sleep 5;
sleep ($systemd_timesyncd_running ? 5 : 15);
if (!$systemd_timesyncd_running) {
&backquote_logged("systemctl stop systemd-timesyncd 2>&1");
}
}
else {
$out = "Missing ntpdate and sntp commands";