op-continue-mpreboot: ensure it runs after start_host
During an mpreboot, the obmc-host-startmin@.target is executed. Within
this target there are two services that can start the boot. One is the
standard start_host@.service which is used for a normal boot. The
op-continue-mpreboot@.service is used when it is a mpreboot.
The decision on which one runs and which one doesn't is based on the
/run/openbmc/mpreboot@%i file. The race condition we have is that both
services start at the same time from a systemd perspective. If the
mpreboot service happens to run first, it removes the mpreboot@%i file.
Then when the start_host service starts, it does not see the file so it
also runs! This is not good. To fix this, ensure the start_host service
runs first if it is started at the same time as the mpreboot service.
Tested:
- Verified start_host ran first and was skipped in mpreboot
Oct 27 22:46:58 openbmc systemd[1]: Condition check resulted in Start host0 SBE being skipped.
Oct 27 22:46:58 openbmc systemd[1]: Starting Continue mp reboot on host0...
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ifb995d3d1ac66314db5a171446097f88ead277c4
diff --git a/service_files/op-continue-mpreboot@.service.in b/service_files/op-continue-mpreboot@.service.in
index 00a6c98..d391104 100644
--- a/service_files/op-continue-mpreboot@.service.in
+++ b/service_files/op-continue-mpreboot@.service.in
@@ -6,6 +6,7 @@
Before=obmc-host-started@%i.target
Wants=obmc-power-on@%i.target
After=obmc-power-on@%i.target
+After=start_host@%i.service
Conflicts=obmc-host-stop@%i.target
ConditionPathExists=/run/openbmc/mpreboot@%i