From 956b8fd7c76b9f5134e60f045d8ef7ee7d5bb7ec Mon Sep 17 00:00:00 2001
From: Sujin Kang <sujkang@microsoft.com>
Date: Fri, 10 Jan 2020 09:47:13 -0800
Subject: [PATCH] [reboot cause]: Delay process-reboot-cause service until
 network connection is stable (#4003)

---
 files/build_templates/process-reboot-cause.timer         | 9 +++++++++
 files/build_templates/sonic_debian_extension.j2          | 5 +++++
 .../process-reboot-cause/process-reboot-cause.service    | 3 ---
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 files/build_templates/process-reboot-cause.timer

diff --git a/files/build_templates/process-reboot-cause.timer b/files/build_templates/process-reboot-cause.timer
new file mode 100644
index 0000000000..222c51a79a
--- /dev/null
+++ b/files/build_templates/process-reboot-cause.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Delays process-reboot-cause until network is stably connected
+
+[Timer]
+OnBootSec=1min 30 sec
+Unit=process-reboot-cause.service
+
+[Install]
+WantedBy=timers.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index be4a119709..6f61270de2 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -245,6 +245,11 @@ sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd.service  $FILESYSTEM_ROOT/etc/systemd/s
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable caclmgrd.service
 sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd $FILESYSTEM_ROOT/usr/bin/
 
+# Copy systemd timer configuration
+# It implements delayed start of services
+sudo cp $BUILD_TEMPLATES/process-reboot-cause.timer $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable process-reboot-cause.timer
+
 # Copy process-reboot-cause service files
 sudo cp $IMAGE_CONFIGS/process-reboot-cause/process-reboot-cause.service  $FILESYSTEM_ROOT/etc/systemd/system/
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable process-reboot-cause.service
diff --git a/files/image_config/process-reboot-cause/process-reboot-cause.service b/files/image_config/process-reboot-cause/process-reboot-cause.service
index a429339dbe..b9821f60c4 100644
--- a/files/image_config/process-reboot-cause/process-reboot-cause.service
+++ b/files/image_config/process-reboot-cause/process-reboot-cause.service
@@ -5,6 +5,3 @@ After=rc-local.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/process-reboot-cause
-
-[Install]
-WantedBy=multi-user.target