summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/watchdog
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-09-29 10:50:55 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-10-11 14:01:41 +0000
commitc12b5bf2308ccff1c8f0161c0a9ad10661d6d9a7 (patch)
tree7d0a66b6fe6279f347f287f6f830e5e550708b9b /meta-phosphor/common/recipes-phosphor/watchdog
parent3160fe0686850071be3e908227820d43d58fec7a (diff)
downloadtalos-openbmc-c12b5bf2308ccff1c8f0161c0a9ad10661d6d9a7.tar.gz
talos-openbmc-c12b5bf2308ccff1c8f0161c0a9ad10661d6d9a7.zip
Host watchdog needs to conflict with quiesce target
If the server enters the quiesce target, the BMC needs to stop the host watchdog. This is so the BMC does not log a second error (one for whatever caused quiesce and one for the host watchdog timeout). If the host watchdog timeout is the reason for entering the quiesce target, then it's error will be logged prior to entering the quiesce target. Resolves openbmc/openbmc#2282 Change-Id: I43fe484049587cc579ec04fd399a4ae78134031c Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/watchdog')
-rw-r--r--meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
index 93e74e38b..b25324982 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf
@@ -1,3 +1,4 @@
[Unit]
Conflicts=obmc-host-stop@0.target
Conflicts=obmc-chassis-poweroff@0.target
+Conflicts=obmc-host-quiesce@0.target
OpenPOWER on IntegriCloud