host-reboot: enforce host boot count on host crash
The host reboot path can be triggered via paths outside of the normal
RequestedHostTransition property set. For example, if the host crashes,
it just triggers an automatic reboot using the systemd targets, which
means the check to prevent continuous host reboots is not run.
This commit ensures we decrement the reboot counter when a host crash
occurs, and it also ensures we check that count when deciding if a
reboot should occur.
While testing, it was found when we end in the host Quiesce state (after
all reboot attempts have expired), the host stayed in Quiesce, even
after issuing a power off. The fix for that was to ensure the
obmc-host-quiesce@.target conflicted with obmc-host-stop@.target to
ensure it would properly run on the power off request and update the
host state to Off.
Tested:
- Verified that AttemptsLeft was properly decremented on host crashes
- Verified that when AttempsLeft reached 0, the reboot was halted
and the host state was moved to Quiesced
- Verified that once in Quiesced, system could be powered off, and a
boot worked fine (and AttempsLeft was back to 3)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I8d101b987517e160becc712ed70950f1d3204397
diff --git a/service_files/phosphor-reboot-host@.service b/service_files/phosphor-reboot-host@.service
index 0dd8bbb..a5cf9a1 100644
--- a/service_files/phosphor-reboot-host@.service
+++ b/service_files/phosphor-reboot-host@.service
@@ -6,14 +6,14 @@
After=obmc-host-stopped@%i.target
[Service]
-#ExecStart=/bin/systemctl start obmc-host-start@%i.target
-# This service is starting another target that conflicts with the
-# target this service is running in. OpenBMC needs a refactor of
-# how it does its host reset path. Until then, this short term
+# This service is running a script that is starting another target that
+# conflicts with the target this service is running in. OpenBMC needs a
+# refactor of how it does its host reset path. Until then, this short term
# solution does the job.
# Since this is a part of the reboot target, call the startmin
-# target which does the minimum required to start the host.
-ExecStart=/bin/sh -c "sleep 5 && systemctl start obmc-host-startmin@%i.target"
+# target which does the minimum required to start the host if the reboot count
+# is not 0, otherwise it will quiesce the host.
+ExecStart=/usr/libexec/host-reboot %i
[Install]
WantedBy=obmc-host-reboot@%i.target