diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-04 15:30:25 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2026-01-04 21:30:27 +0000 |
| commit | dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2 (patch) | |
| tree | 369d73fa29c3c694026e5ab61b4d95630ba255e0 /perl-install/install | |
| parent | be0ef82523ad8d642f12ff13e4a9e152f8fc15b7 (diff) | |
| download | drakx-dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2.tar drakx-dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2.tar.gz drakx-dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2.tar.bz2 drakx-dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2.tar.xz drakx-dd7c30bd6b30a6ac3cf23b5460e8337f147b13a2.zip | |
drakclock: fix config file read/write for chrony and ntpsec (mga#34664)
drakclock only supports selecting a server pool, not individual servers,
so use the "pool" directive instead if the "server" directive. Rename
the subroutines in timezone.pm for clarity.
ntpsec overrides /etc/ntp.conf with settings found in /etc/ntp.d/, so
we need to read/write /etc/ntp.d/use-pool.
Both chrony and ntpsec support the iburst option, so we can write that
unconditionally.
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/any.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 83b255efd..8772879ac 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -133,7 +133,7 @@ sub preConfigureTimezone { $o->{timezone}{timezone} ||= timezone::bestTimezone($o->{locale}{country}); my $utc = every { !isFat_or_NTFS($_) } @{$o->{fstab}}; - my $ntp = timezone::ntp_server(); + my $ntp = timezone::ntp_pool(); add2hash_($o->{timezone}, { UTC => $utc, ntp => $ntp }); #- Make the timezone available to urpm::mirrors. |