From 80cd2606b91ce2735a0609c6f964917cf12685aa Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 2 Sep 2014 14:33:59 +0200 Subject: [PATCH] timesyncd: don't reset polling interval when reselecting server Original patch from: Miroslav Lichvar --- src/timesync/timesyncd-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index a66852d7d2..3261bc1fb1 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -721,7 +721,8 @@ static int manager_begin(Manager *m) { assert_return(m->current_server_address, -EHOSTUNREACH); m->missed_replies = NTP_MAX_MISSED_REPLIES; - m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC; + if (m->poll_interval_usec == 0) + m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC; server_address_pretty(m->current_server_address, &pretty); log_info("Using NTP server %s (%s).", strna(pretty), m->current_server_name->string);