diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-04 17:21:15 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-04 21:32:20 +0000 |
| commit | 94fe5964a4c89834c010ef6822129d1084e2ac06 (patch) | |
| tree | d92a0344b2ebc3dc98851bcf4e61b43321a0e1d2 /perl-install/standalone | |
| parent | bf9e1e4eb48e07bf9e36e165443a0ee68609dd0b (diff) | |
| download | drakx-94fe5964a4c89834c010ef6822129d1084e2ac06.tar drakx-94fe5964a4c89834c010ef6822129d1084e2ac06.tar.gz drakx-94fe5964a4c89834c010ef6822129d1084e2ac06.tar.bz2 drakx-94fe5964a4c89834c010ef6822129d1084e2ac06.tar.xz drakx-94fe5964a4c89834c010ef6822129d1084e2ac06.zip | |
drakclock: make sure we configure the currently installed ntp service.
drakclock can install chrony, so the ntpd and ntp_conf strings
provided by the imezone module should be dynamic, not static.
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakclock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index b05faaa63..15ef0bafa 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -106,7 +106,7 @@ $my_win->{window}->add( cancel_clicked => sub { ugtk3->exit(0) }, ok_clicked => sub { my $need_date = 1; - my $ntp_service = $timezone::ntpd . '.service'; + my $ntp_service = timezone::ntpd() . '.service'; any::disable_x_screensaver(); if ($check_ntp->get_active) { my $chosen_pool = $combo_ntp_pool->entry->get_text; @@ -177,7 +177,7 @@ $time_box->set_direction('ltr'); my $servers = get_servers(); $combo_ntp_pool->set_popdown_strings(@$servers); -if (-e $timezone::ntp_conf && is_ntp_daemon_running()) { +if (-e timezone::ntp_conf() && is_ntp_daemon_running()) { $ntp = timezone::ntp_pool(); $ntp and ntp_widget_state(1); my $fullntp = $ntp; @@ -240,7 +240,7 @@ sub install_ntp() { $my_win->{window}->set_sensitive(1); } sub is_ntp_daemon_running() { - my $ntp_service = $timezone::ntpd . '.service'; + my $ntp_service = timezone::ntpd() . '.service'; !system("systemctl is-active $ntp_service >/dev/null"); } sub get_servers() { |