From a57cb1413e38ee233a2f261654f2a95f4ea46bce Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Wed, 20 Feb 2019 08:04:12 -0800
Subject: [PATCH] [ntp] disable ntp time jump (#2589)

- removing -g to disable jump when time difference is greater than 1000s
- add -x to disable initial jump
---
 build_debian.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_debian.sh b/build_debian.sh
index b8514e78d7..6bac523b5d 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -263,6 +263,10 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
+## Modifty ntp default configuration: disable initial jump (add -x), and disable
+## jump when time difference is greater than 1000 seconds (remove -g).
+sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp
+
 ## Fix ping tools permission so non root user can directly use them
 ## Note: this is a workaround since aufs doesn't support extended attributes
 ## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489