summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Soldatov <a.soldatov@yadro.com>2018-01-22 10:07:06 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-01-23 14:44:45 +0000
commit80f2e68c1103944c4f535f0ab601a2d95b03ea29 (patch)
tree7904a4265defc1189cfd74f0f3d80cdb1d2e9a4f
parentb1009126ab6e5fd144b039f86635bc6953f53cf5 (diff)
downloadtalos-openbmc-80f2e68c1103944c4f535f0ab601a2d95b03ea29.tar.gz
talos-openbmc-80f2e68c1103944c4f535f0ab601a2d95b03ea29.zip
Fix host reset on double poweron command
Before this commit, if 'obmcutil poweron' was issued twice, it would result it host reset because a watchdog service would have been started but not signalled by the host to stop upon successful startup. This commit makes the watchdog service persistent so that it doesn't start for the second time. If the BMC is rebooted while the host is powered on, and thus the watchdog service is terminated, that is covered by an already existing condition check for the watchdog service. Resolves openbmc/openbmc#2811 Change-Id: I11212f2a08fc102afee2641c403c50158aae876c Signed-off-by: Alexander Soldatov <a.soldatov@yadro.com> Signed-off-by: Alexander Amelkin <a.amelkin@yadro.com>
-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 7bfc2d0ca..b3d8d4fcd 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
@@ -11,3 +11,4 @@ ConditionPathExists=!/run/openbmc/host@%i-on
Type=oneshot
ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true
SyslogIdentifier=mapper
+RemainAfterExit=yes
OpenPOWER on IntegriCloud