summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPotin Lai <potin.lai@quantatw.com>2023-10-27 04:54:09 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-11-30 06:47:32 +0300
commitb229e651ca0d154d44640f023873c27ceafbe840 (patch)
tree4cad9e62333ed6aaebeea6525930ed22d7a22b23
parent07acadbe16f60b9bcdcddd11ace86c3f67d764ea (diff)
downloadopenbmc-b229e651ca0d154d44640f023873c27ceafbe840.tar.xz
meta-bletchley: fix host power retore AlwaysOn fail
We notice the `start-limit-hit` error message in both chassis-poweron@.service and phosphor-discover-system-state@.service. Change restart to start phosphor-discover-system-state@.service and add `Conflicts` to deactive phosphor-discover-system-state@.service when calling chassis-poweroff@.service. Signed-off-by: Potin Lai <potin.lai@quantatw.com> Change-Id: I0bb11ba81cf699f75597a49fb259372a51899a86
-rw-r--r--meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service2
-rw-r--r--meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service3
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
index 7deff9aa15..f9c770147a 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
@@ -1,9 +1,11 @@
[Unit]
Description=Turn off AC at Sled%i
Conflicts=chassis-poweron@%i.service
+Conflicts=phosphor-discover-system-state@%i.service
After=host-poweroff@%i.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/power-ctrl sled%i ac-off
SyslogIdentifier=power-ctrl
+StartLimitBurst=0 \ No newline at end of file
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
index 2f5f67bed1..d58ebf0626 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
@@ -8,7 +8,8 @@ Conflicts=chassis-poweroff@%i.service
Type=oneshot
ExecStart=/usr/sbin/power-ctrl sled%i ac-on
SyslogIdentifier=power-ctrl
-ExecStartPost=/bin/systemctl restart phosphor-discover-system-state@%i.service
+ExecStartPost=/bin/systemctl start phosphor-discover-system-state@%i.service
+StartLimitBurst=0
[Install]
WantedBy=multi-user.target