From cfe754f665ffa4385c49d0124730c04bbbcff82f Mon Sep 17 00:00:00 2001
From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com>
Date: Sat, 21 Mar 2020 18:50:12 -0700
Subject: [PATCH] [ntp]: Add "tinker panic 0" in ntp.conf to avoid ntpd from
 panic (#4263)

- What I did
Add configuration to avoid ntpd from panic and exit if the drift between new time and current system time is large.

- How I did it
Added "tinker panic 0" in ntp.conf file.

- How to verify it
[this assumes that there is a valid NTP server IP in config_db/ntp.conf]

Change the current system time to a bad time with a large drift from time in ntp server; drift should be greater than 1000s.
Reboot the device.
Before the fix:
3. upon reboot, ntp-config service comes up fine, ntp service goes to active(exited) state without any error message. This is because the offset between new time (from ntp server) and the current system time is very large, ntpd goes to panic mode and exits. The system continues to show the bad time.

After the fix:
3. Upon reboot, ntp-config comes up fine, ntp services comes up from and stays in active (running) state. The system clock gets synced with the ntp server time.
---
 files/image_config/ntp/ntp.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/files/image_config/ntp/ntp.conf.j2 b/files/image_config/ntp/ntp.conf.j2
index cef6527fc2..dbde694432 100644
--- a/files/image_config/ntp/ntp.conf.j2
+++ b/files/image_config/ntp/ntp.conf.j2
@@ -5,6 +5,10 @@
 
 # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
 
+# To avoid ntpd from panic and exit if the drift between new time and
+# current system time is large.
+tinker panic 0
+
 driftfile /var/lib/ntp/ntp.drift