From e83c510de99eb3ae22194f87fd163d3f6ceb7603 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 19 Feb 2019 15:07:30 -0800 Subject: [PATCH] Revert "[baseimage] Delay ntp-config service to start after 5 minutes (#2494)" This reverts commit 33fe8d298ecc9ec380b2bae96604216ccc4cbfd4. --- files/build_templates/ntp-config.timer | 9 --------- files/build_templates/sonic_debian_extension.j2 | 2 -- 2 files changed, 11 deletions(-) delete mode 100644 files/build_templates/ntp-config.timer diff --git a/files/build_templates/ntp-config.timer b/files/build_templates/ntp-config.timer deleted file mode 100644 index ab2d2e755ab2..000000000000 --- a/files/build_templates/ntp-config.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Delays NTP configuration service until SONiC has started - -[Timer] -OnBootSec=5min -Unit=ntp-config.service - -[Install] -WantedBy=timers.target diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index da7ad28b5462..6d86d2b46d57 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -296,9 +296,7 @@ sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh # Copy systemd timer configuration # It implements delayed start of services sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/ -sudo cp $BUILD_TEMPLATES/ntp-config.timer $FILESYSTEM_ROOT/etc/systemd/system/ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer -sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ntp-config.timer sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y