diff options
| author | George Hung <george.hung@quantatw.com> | 2021-06-09 08:59:25 +0300 |
|---|---|---|
| committer | Brandon Kim <brandonkim@google.com> | 2021-06-09 19:15:07 +0300 |
| commit | cf7bc62babb57ea27e7a00cd6271ca53579281fe (patch) | |
| tree | b8441302d47e1a85c322d21fd514b9579463cb2f /meta-quanta | |
| parent | 92804a7d47ef891341c406996e3cc105ab430ff1 (diff) | |
| download | openbmc-cf7bc62babb57ea27e7a00cd6271ca53579281fe.tar.xz | |
Revert "meta-quanta: gbs: enable fallback watchdog"
This reverts commit f5f78f62d720ef57a54660927ba9a45515243190.
Reason for revert: due to x86-power-control not allowing DC cycle when host is down for fallback watchdog action
Change-Id: Idcc6e5d585bfcd9664755b32277d441118beef15
Signed-off-by: George Hung <george.hung@quantatw.com>
Diffstat (limited to 'meta-quanta')
| -rw-r--r-- | meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 | 3 | ||||
| -rw-r--r-- | meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 index 27c438d90..c0f04ef03 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 @@ -3,6 +3,3 @@ SERVICE=xyz.openbmc_project.Watchdog UNIT_HARD_RESET=phosphor-host-watchdog-reset.service UNIT_POWER_OFF=phosphor-host-watchdog-poweroff.service UNIT_POWER_CYCLE=phosphor-host-watchdog-powercycle.service -FALLBACK_ACTION=xyz.openbmc_project.State.Watchdog.Action.PowerCycle -FALLBACK_INTERVAL=180000 -MIN_INTERVAL=60000 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index 4577cd1c1..df11b22e5 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,8 +4,7 @@ Description=Phosphor Watchdog [Service] EnvironmentFile={envfiledir}/obmc/watchdog/%I ExecStart=/usr/bin/env phosphor-watchdog --service=${{SERVICE}} --path=${{DEVPATH}} \ - --continue --fallback_always --min_interval=${{MIN_INTERVAL}} \ - --fallback_action=${{FALLBACK_ACTION}} --fallback_interval=${{FALLBACK_INTERVAL}} \ + --continue \ --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=${{UNIT_HARD_RESET}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=${{UNIT_POWER_OFF}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=${{UNIT_POWER_CYCLE}} |