summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/timezone.pm8
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() {