summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-07-30 00:16:52 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-07-30 00:16:52 +0300
commitbb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch)
tree00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog
parentdefdca82c107f46e980c84bffb1b2c1263522fa0 (diff)
parentcf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff)
downloadopenbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/watchdog/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@.service3
2 files changed, 2 insertions, 2 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 591d6dcd7..a972a470f 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 52c129025..e559d9fab 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
@@ -4,5 +4,4 @@ Description=Phosphor %I watchdog
[Service]
Restart=no
EnvironmentFile={envfiledir}/obmc/watchdog/%I
-ExecStart=/usr/bin/env phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}}
-SyslogIdentifier=phosphor-watchdog
+ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} --default_interval=${{TIMEOUT_IN_MSEC}}