diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-11-23 11:08:35 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-11-23 11:11:12 +0000 |
| commit | a69511015762808bba2d17cfc64485eb7fd5e420 (patch) | |
| tree | 9a0dcd0f02d4aa432ef60827148cd8e2ae5eef76 | |
| parent | a70773cb277033a412fc9d71ff53383b29cbb84a (diff) | |
| download | drakx-a69511015762808bba2d17cfc64485eb7fd5e420.tar drakx-a69511015762808bba2d17cfc64485eb7fd5e420.tar.gz drakx-a69511015762808bba2d17cfc64485eb7fd5e420.tar.bz2 drakx-a69511015762808bba2d17cfc64485eb7fd5e420.tar.xz drakx-a69511015762808bba2d17cfc64485eb7fd5e420.zip | |
timezone: As we will install chrony, assume that when nothing is installed.
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/timezone.pm | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 40de8d645..d8193d3a6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- timezone: Assume chrony rather than ntp when neither is installed - draksec: support polkit rules editing for permissions overrides. Version 15.73.1 - 19 November 2013 diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index b4b4cfe89..eeb1ed30d 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -24,11 +24,11 @@ sub read() { { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) }; } -our $ntp = "chrony"; -my $servername_config_suffix = " iburst"; +our $ntp = "ntp"; +my $servername_config_suffix = ""; unless (-f $::prefix . "/etc/" . $ntp . ".conf") { - $ntp = "ntp"; - $servername_config_suffix = ""; + $ntp = "chrony"; + $servername_config_suffix = " iburst"; } sub ntp_server() { |