Skip to content

Commit

Permalink
Fix ntp service silently exits issue when the time drift was too large
Browse files Browse the repository at this point in the history
The ntpd process will exit silently with "-x" startup option
when the current system time is drifted too far from the ntp
server's time (> 1000 seconds). The option was introduced to
workaround the supervisord issue which was fixed:
sonic-net#2624

We are reverting the change to use "-g" option for ntpd process:
Revert "[ntp] disable ntp time jump (sonic-net#2589)"
This reverts commit a57cb14.

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>

RB=2010953
G=lnos-reviewers
R=pchaudhary,pmao,vapatil,samaity,zxu
A=
  • Loading branch information
zhenggen-xu committed Mar 18, 2020
1 parent 9a59c81 commit 5857c6f
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,6 @@ 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
Expand Down

0 comments on commit 5857c6f

Please sign in to comment.