forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ntp] add ntp support in buster with mgmt vrf (sonic-net#55)
- create a file in files/image_config/ntp/ntp-systemd-wrapper to add mgmt vrf related start cmd for ntp service. So that the default /usr/lib/ntp/ntp-systemd-wrapper can be overriden during build time. - modify build_debian.sh to cp files/image_config/ntp/ntp-systemd-wrapper to /usr/lib/ntp/ntp-systemd-wrapper during build time. Co-authored-by: Bing Sun <Bing_Sun@dell.com>
- Loading branch information
Showing
2 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#!/bin/sh | ||
|
||
# This file was originally created automatically as part of default NTP application installation from debian package. | ||
# This is now manually modified for supporting NTP in management VRF. | ||
# When management VRF is enabled, the NTP application should be started using "ip vrf exec mgmt". | ||
# Check has been added to verify the management VRF enabled status and use "ip vrf exec mgmt" when it is enabled. | ||
# This file will be copied to /usr/lib/ntp/ntp-systemd-wrapper file that gets created during build process. | ||
|
||
DAEMON=/usr/sbin/ntpd | ||
PIDFILE=/var/run/ntpd.pid | ||
|
||
if [ -r /etc/default/ntp ]; then | ||
. /etc/default/ntp | ||
fi | ||
|
||
if [ -e /run/ntp.conf.dhcp ]; then | ||
NTPD_OPTS="$NTPD_OPTS -c /run/ntp.conf.dhcp" | ||
fi | ||
|
||
LOCKFILE=/run/lock/ntpdate | ||
|
||
RUNASUSER=ntp | ||
UGID=$(getent passwd $RUNASUSER | cut -f 3,4 -d:) || true | ||
if test "$(uname -s)" = "Linux"; then | ||
NTPD_OPTS="$NTPD_OPTS -u $UGID" | ||
fi | ||
|
||
( | ||
flock -w 180 9 | ||
vrfEnabled=$(/usr/local/bin/sonic-cfggen -d -v 'MGMT_VRF_CONFIG["vrf_global"]["mgmtVrfEnabled"]' 2> /dev/null) | ||
if [ "$vrfEnabled" = "true" ] | ||
then | ||
ip vrf exec mgmt start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS | ||
else | ||
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS | ||
fi | ||
) 9>$LOCKFILE | ||
|