From 60e424e3be655136531dee9bcccac4703a20fb37 Mon Sep 17 00:00:00 2001
From: shlomibitton <60430976+shlomibitton@users.noreply.github.com>
Date: Thu, 21 Oct 2021 02:08:36 +0300
Subject: [PATCH] Fix delay type from boot instead of unit activation (#8895)

Why I did it
With current code the delay will take place even if simple 'config reload' command executed and this is not desired.
This delay should be used only when fast-rebooting.

How I did it
Change the type of delay to OnBootSec instead of OnActiveSec.

How to verify it
Fast-reboot with this PR and observe the delay.
Run 'config-reload' command and observe no delay is running.
---
 .../debian/sonic-host-services-data.aaastatsd.timer            | 3 ++-
 .../debian/sonic-host-services-data.hostcfgd.timer             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.aaastatsd.timer b/src/sonic-host-services-data/debian/sonic-host-services-data.aaastatsd.timer
index e0458ff326..8b6426db18 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.aaastatsd.timer
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.aaastatsd.timer
@@ -3,7 +3,8 @@ Description=Delays aaastatsd daemon until SONiC has started
 PartOf=aaastatsd.service
 
 [Timer]
-OnActiveSec=1min 30 sec
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
 Unit=aaastatsd.service
 
 [Install]
diff --git a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
index baf80f4b4c..b45fd4b22f 100644
--- a/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
+++ b/src/sonic-host-services-data/debian/sonic-host-services-data.hostcfgd.timer
@@ -3,7 +3,8 @@ Description=Delays hostcfgd daemon until SONiC has started
 PartOf=hostcfgd.service
 
 [Timer]
-OnActiveSec=1min 30 sec
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
 Unit=hostcfgd.service
 
 [Install]