summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2017-07-12 10:37:42 -0500
committerPatrick Williams <patrick@stwcx.xyz>2017-07-13 19:03:29 +0000
commitd69337ec77bef9fc7ffc6810c34ead95a930d03c (patch)
tree19848941f12c05f877bf2200bfe063cd2cfe1e85
parent8b60de789d7f553a3480db2590304fbc9a33d1c2 (diff)
downloadtalos-openbmc-d69337ec77bef9fc7ffc6810c34ead95a930d03c.tar.gz
talos-openbmc-d69337ec77bef9fc7ffc6810c34ead95a930d03c.zip
phosphor-watchdog: don't enable watchdog on BMC reboot
There are applications we do not want to reenable after a BMC reboot and the typical mechanism for that is a ConditionPathExists on a marker file we create in /run. This was missing for the Host watchdog enable service, which caused the watchdog to be re-enabled even though the boot process was complete. Add the ConditionPathExists to prevent it from becoming enabled. Resolves openbmc/openbmc#1948. Change-Id: Ibb64ee40d9b6313bc44205c751d130345be695ed Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
index 1fc88f332..a921fc316 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
@@ -5,6 +5,7 @@ After=obmc-host-started@%i.target
Wants=mapper-wait@-xyz-openbmc_project-watchdog-host%i.service
After=mapper-wait@-xyz-openbmc_project-watchdog-host%i.service
Conflicts=obmc-host-stop@%i.target
+ConditionPathExists=!/run/openbmc/host@%i-on
[Service]
Type=oneshot
OpenPOWER on IntegriCloud