multi-user: do not use wants relationship
The multi-user target is run by systemd when the BMC first boots. It
contains all of the initial startup services. Some OpenBMC targets want
to ensure they are run after the multi-user target completes. A lot of
these targets did both a Wants and After relationship with multi-user.
The latest systemd, version 245, now takes that Wants relationship
seriously and will start any services within multi-user that are
stopped. This includes oneshot services which do not have the
"RemainAfterExit=yes" clause. If these services only expected to be run
once, as a part of multi-user, then they should include this clause but
you can see how they may expected to have only been run once.
The solution is twofold:
1) Fix the oneshot services that fall in the above scenario
2) Change the targets to not Wants=multi-user.target
1 will be changes throughout a few repositories.
2 is fixed in this commit.
Resolves openbmc/phosphor-state-manager#14
Tested:
Provided test image to George and he verified this fixed the above
issue
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I6eb7e5d2cb7d5a3c95f2e8ef6efc708dbb63fd52
diff --git a/target_files/obmc-chassis-hard-poweroff@.target b/target_files/obmc-chassis-hard-poweroff@.target
index a033f60..87ce0a9 100644
--- a/target_files/obmc-chassis-hard-poweroff@.target
+++ b/target_files/obmc-chassis-hard-poweroff@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Chassis%i (Hard Power Off)
-Wants=multi-user.target
After=multi-user.target
Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
diff --git a/target_files/obmc-chassis-powered-off@.target b/target_files/obmc-chassis-powered-off@.target
index c043f37..4744f53 100644
--- a/target_files/obmc-chassis-powered-off@.target
+++ b/target_files/obmc-chassis-powered-off@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Chassis%i (Powered Off)
-Wants=multi-user.target
After=multi-user.target
Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
diff --git a/target_files/obmc-chassis-poweroff@.target b/target_files/obmc-chassis-poweroff@.target
index 69209e6..87da549 100644
--- a/target_files/obmc-chassis-poweroff@.target
+++ b/target_files/obmc-chassis-poweroff@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Chassis%i (Power Off)
-Wants=multi-user.target
After=multi-user.target
Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
diff --git a/target_files/obmc-chassis-poweron@.target b/target_files/obmc-chassis-poweron@.target
index cd7c2fc..e1aa7cf 100644
--- a/target_files/obmc-chassis-poweron@.target
+++ b/target_files/obmc-chassis-poweron@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Chassis%i (Power On)
-Wants=multi-user.target
After=multi-user.target
Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
diff --git a/target_files/obmc-host-diagnostic-mode@.target b/target_files/obmc-host-diagnostic-mode@.target
index 27f07b6..dbd2784 100644
--- a/target_files/obmc-host-diagnostic-mode@.target
+++ b/target_files/obmc-host-diagnostic-mode@.target
@@ -3,7 +3,6 @@
# collecting debug data which can be used to
# debug a user or self detected error in the host
Description=Diagnostic Mode Collection for Host%i
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-startmin@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-host-force-warm-reboot@.target b/target_files/obmc-host-force-warm-reboot@.target
index 7ad452a..2942397 100644
--- a/target_files/obmc-host-force-warm-reboot@.target
+++ b/target_files/obmc-host-force-warm-reboot@.target
@@ -2,7 +2,6 @@
# This will perform a forced restart of the host while keeping the chassis
# power on
Description=Force Warm Reboot Host%i
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-startmin@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-host-quiesce@.target b/target_files/obmc-host-quiesce@.target
index 900995b..fd050ad 100644
--- a/target_files/obmc-host-quiesce@.target
+++ b/target_files/obmc-host-quiesce@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Quiesce Target
-Wants=multi-user.target
After=multi-user.target
RefuseManualStop=yes
Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/target_files/obmc-host-reboot@.target b/target_files/obmc-host-reboot@.target
index 8e749e6..2a24bab 100644
--- a/target_files/obmc-host-reboot@.target
+++ b/target_files/obmc-host-reboot@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Reboot Host%i
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-startmin@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-host-shutdown@.target b/target_files/obmc-host-shutdown@.target
index 012d364..3a43847 100644
--- a/target_files/obmc-host-shutdown@.target
+++ b/target_files/obmc-host-shutdown@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Power%i Host Off
-Wants=multi-user.target
+After=multi-user.target
RefuseManualStop=yes
OnFailure=obmc-chassis-poweroff@%i.target
OnFailureJobMode=flush
diff --git a/target_files/obmc-host-start-pre@.target b/target_files/obmc-host-start-pre@.target
index fe55146..fe38262 100644
--- a/target_files/obmc-host-start-pre@.target
+++ b/target_files/obmc-host-start-pre@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Start Host%i (Pre)
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-stop@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-host-start@.target b/target_files/obmc-host-start@.target
index ff1486b..b8ea24a 100644
--- a/target_files/obmc-host-start@.target
+++ b/target_files/obmc-host-start@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Start Host%i
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-stop@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-host-started@.target b/target_files/obmc-host-started@.target
index fcd51be..de76e46 100644
--- a/target_files/obmc-host-started@.target
+++ b/target_files/obmc-host-started@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Host%i (Started)
-Wants=multi-user.target
+After=multi-user.target
After=obmc-host-starting@%i.target
Conflicts=obmc-host-stop@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-host-starting@.target b/target_files/obmc-host-starting@.target
index 52e7bea..e568aea 100644
--- a/target_files/obmc-host-starting@.target
+++ b/target_files/obmc-host-starting@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Host%i (Starting)
-Wants=multi-user.target
+After=multi-user.target
After=obmc-host-start-pre@%i.target
Conflicts=obmc-host-stop@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-host-startmin@.target b/target_files/obmc-host-startmin@.target
index 88ccb25..6820e59 100644
--- a/target_files/obmc-host-startmin@.target
+++ b/target_files/obmc-host-startmin@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Start Host%i Minimum
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-stop@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-host-stop-pre@.target b/target_files/obmc-host-stop-pre@.target
index 9fc3296..1ca4d55 100644
--- a/target_files/obmc-host-stop-pre@.target
+++ b/target_files/obmc-host-stop-pre@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Stop Host%i (Pre)
-Wants=multi-user.target
After=multi-user.target
Before=obmc-host-stopping@%i.target
Conflicts=obmc-host-startmin@%i.target
diff --git a/target_files/obmc-host-stop@.target b/target_files/obmc-host-stop@.target
index 496fd5b..4c8ff1b 100644
--- a/target_files/obmc-host-stop@.target
+++ b/target_files/obmc-host-stop@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Stop Host%i
-Wants=multi-user.target
After=multi-user.target
After=obmc-chassis-poweroff@%i.target
Conflicts=obmc-host-startmin@%i.target
diff --git a/target_files/obmc-host-stopped@.target b/target_files/obmc-host-stopped@.target
index c968979..4c2a1da 100644
--- a/target_files/obmc-host-stopped@.target
+++ b/target_files/obmc-host-stopped@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Host%i (Stopped)
-Wants=multi-user.target
+After=multi-user.target
Wants=obmc-host-stopping@%i.target
After=obmc-host-stopping@%i.target
Before=obmc-power-stop-pre@%i.target
diff --git a/target_files/obmc-host-stopping@.target b/target_files/obmc-host-stopping@.target
index 41c4b7f..63eae4e 100644
--- a/target_files/obmc-host-stopping@.target
+++ b/target_files/obmc-host-stopping@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Host%i (Stopping)
-Wants=multi-user.target
+After=multi-user.target
Wants=obmc-host-stop-pre@%i.target
After=obmc-host-stop-pre@%i.target
Before=obmc-host-stopped@%i.target
diff --git a/target_files/obmc-host-warm-reboot@.target b/target_files/obmc-host-warm-reboot@.target
index 2f8996c..33b9246 100644
--- a/target_files/obmc-host-warm-reboot@.target
+++ b/target_files/obmc-host-warm-reboot@.target
@@ -2,7 +2,6 @@
# This will perform a graceful restart of the host while keeping the chassis
# power on
Description=Graceful Warm Reboot Host%i
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-host-startmin@%i.target
RefuseManualStop=yes
diff --git a/target_files/obmc-power-off@.target b/target_files/obmc-power-off@.target
index 7fda29b..59601bc 100644
--- a/target_files/obmc-power-off@.target
+++ b/target_files/obmc-power-off@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Power%i (Off)
-Wants=multi-user.target
+After=multi-user.target
After=obmc-power-stop@%i.target
Conflicts=obmc-chassis-poweron@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-power-on@.target b/target_files/obmc-power-on@.target
index b55d909..a8affb2 100644
--- a/target_files/obmc-power-on@.target
+++ b/target_files/obmc-power-on@.target
@@ -1,6 +1,6 @@
[Unit]
Description=Power%i (On)
-Wants=multi-user.target
+After=multi-user.target
After=obmc-power-start@%i.target
Conflicts=obmc-chassis-poweroff@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-power-start-pre@.target b/target_files/obmc-power-start-pre@.target
index 2b5fdbb..9fef7c0 100644
--- a/target_files/obmc-power-start-pre@.target
+++ b/target_files/obmc-power-start-pre@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Power%i On (Pre)
-Wants=multi-user.target
After=multi-user.target
Conflicts=obmc-chassis-poweroff@%i.target
RefuseManualStart=yes
diff --git a/target_files/obmc-power-start@.target b/target_files/obmc-power-start@.target
index 720548e..b3bd11e 100644
--- a/target_files/obmc-power-start@.target
+++ b/target_files/obmc-power-start@.target
@@ -1,7 +1,7 @@
[Unit]
Description=Power%i On
After=obmc-power-start-pre@%i.target
-Wants=multi-user.target
+After=multi-user.target
Conflicts=obmc-chassis-poweroff@%i.target
RefuseManualStart=yes
RefuseManualStop=yes
diff --git a/target_files/obmc-power-stop-pre@.target b/target_files/obmc-power-stop-pre@.target
index 5460914..9462a29 100644
--- a/target_files/obmc-power-stop-pre@.target
+++ b/target_files/obmc-power-stop-pre@.target
@@ -1,6 +1,5 @@
[Unit]
Description=Power%i Off (Pre)
-Wants=multi-user.target
After=multi-user.target
Wants=obmc-host-stopped@%i.target
After=obmc-host-stopped@%i.target
diff --git a/target_files/obmc-power-stop@.target b/target_files/obmc-power-stop@.target
index fc22eb1..d19d941 100644
--- a/target_files/obmc-power-stop@.target
+++ b/target_files/obmc-power-stop@.target
@@ -2,7 +2,7 @@
Description=Power%i Off
Wants=obmc-power-stop-pre@%i.target
After=obmc-power-stop-pre@%i.target
-Wants=multi-user.target
+After=multi-user.target
Conflicts=obmc-chassis-poweron@%i.target
Conflicts=fsi-disable.service
RefuseManualStart=yes