diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-21 03:22:43 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-24 17:45:46 +0200 |
| commit | 3745770ae4dcf262707882a38f6c5ba2684329a3 (patch) | |
| tree | f2da1e55e166fcf88db084cb157b48a06dd05561 /src/timesync/timesyncd.c | |
| parent | mailmap: add entry for John Paul Adrian Glaubitz (#6015) (diff) | |
| download | systemd-3745770ae4dcf262707882a38f6c5ba2684329a3.tar.xz systemd-3745770ae4dcf262707882a38f6c5ba2684329a3.zip | |
timesyncd: don't use compiled-in list if FallbackNTP has been configured explicitly
Parse the config files first and only apply the compiled-in list of
fallback servers if no NTP server was configured via FallbackNTP.
Closes: #5091
Diffstat (limited to 'src/timesync/timesyncd.c')
| -rw-r--r-- | src/timesync/timesyncd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index b67d672a6a..052329f61e 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -132,6 +132,8 @@ int main(int argc, char *argv[]) { if (r < 0) log_warning_errno(r, "Failed to parse configuration file: %m"); + assert_se(manager_parse_fallback_string(m, NTP_SERVERS) >= 0); + log_debug("systemd-timesyncd running as pid " PID_FMT, getpid()); sd_notify(false, "READY=1\n" |