summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/watchdog
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-05-11 00:03:43 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-05-27 16:39:10 +0300
commitfb9869ff2816f52029c38b093d29e5a2c565d283 (patch)
treee5c04a910422f14fcd4170887725892cd2fe018e /meta-phosphor/recipes-phosphor/watchdog
parent17f71a1da5666763b52ddd443287a31109cf951e (diff)
downloadopenbmc-fb9869ff2816f52029c38b093d29e5a2c565d283.tar.xz
watchdog: pass in default timeout on service start
This commit will allow other meta layers to easily override the default timeout on watchdog start. Without passing the --min_interval option there is no way currently for other layers to change this on startup. Set the default of 30000 milliseconds to match the current default defined within the phosphor-dbus-interface. Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I6a25d5dd3da5704113c3f77d6f9737e0705b3d01
Diffstat (limited to 'meta-phosphor/recipes-phosphor/watchdog')
-rw-r--r--meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron1
-rw-r--r--meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
index 591d6dcd7c..a972a470f0 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
@@ -1,3 +1,4 @@
DEVPATH=/xyz/openbmc_project/watchdog/host0
SERVICE=xyz.openbmc_project.Watchdog
TARGET=obmc-host-timeout@0.target
+TIMEOUT_IN_MSEC=30000
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
index aab1ddbee1..1f65902569 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
@@ -4,4 +4,4 @@ Description=Phosphor %I watchdog
[Service]
Restart=no
EnvironmentFile={envfiledir}/obmc/watchdog/%I
-ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}}
+ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} --min_interval=${{TIMEOUT_IN_MSEC}}