diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 20:58:07 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 21:11:45 +0300 |
commit | fc81e38aed2df98ed8c83b3ce7970f6434765a41 (patch) | |
tree | 0ed58adcb31a230146652e2d2e37f14f5906b333 /meta-phosphor/recipes-core/systemd | |
parent | 9d8e46dcee0a07bc206e8980c7d9df0027935121 (diff) | |
download | openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.tar.xz |
update upstream subtrees
A number of corequisites exist so squashing these all into one patch.
meta-ingrasys - refresh master bc513127f4..67bcaf389f
meta-hxt - refresh master 86a4df514f..8fe0d38bbb
meta-phosphor - refresh master 06c09d7cce..df6ddae3d2
meta-quanta - refresh master 4f126361a1..53f3025271
Change-Id: I3daeef2a0467d8ea4f1fd1c617e526f8b11258af
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-core/systemd')
24 files changed, 37 insertions, 37 deletions
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target index 48fc441694..a033f6050c 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Hard Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +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 Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target index 84c1ddab1f..c043f37446 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Powered Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +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 Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target index 080d72456b..69209e64ac 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +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 Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target index 55f6d919b0..cd7c2fc496 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target @@ -1,7 +1,7 @@ [Unit] Description=Chassis%i (Power On) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +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 Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target index 8d7c47e6bc..03036f3013 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target @@ -4,4 +4,4 @@ Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStop=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target index 4f10419abc..900995b9f0 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target @@ -1,6 +1,6 @@ [Unit] Description=Quiesce Target -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target RefuseManualStop=yes Conflicts=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target index dc280ea653..a01b942511 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target @@ -1,7 +1,7 @@ [Unit] Description=Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-startmin@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target index ca95d843c2..84d8701635 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target @@ -4,4 +4,4 @@ Conflicts=obmc-host-stop@%i.target RefuseManualStop=yes [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target index 4768a567fa..012d364a16 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i Host Off -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target RefuseManualStop=yes OnFailure=obmc-chassis-poweroff@%i.target OnFailureJobMode=flush diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target index 2bc270c146..fe55146180 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target index 144b633878..790ef6af9b 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target index eb0a9383be..fcd51be892 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Started) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-host-starting@%i.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target index 408139dd43..52e7bea839 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Starting) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-host-start-pre@%i.target Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target index 6e924adcd7..fc93cdce4a 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target @@ -1,7 +1,7 @@ [Unit] Description=Start Host%i Minimum -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service Conflicts=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target index e88d3ea587..9fc3296b19 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Stop Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Before=obmc-host-stopping@%i.target Conflicts=obmc-host-startmin@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target index 8e99bccdb9..d8f3cc9381 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target @@ -1,7 +1,7 @@ [Unit] Description=Stop Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service After=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target index 74039fc25c..c9689790bd 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Stopped) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=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/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target index f087dea723..41c4b7f95a 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Stopping) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=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/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target index c47b21e477..7fda29b1e7 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i (Off) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-power-stop@%i.target Conflicts=obmc-chassis-poweron@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target index 52135ffc9c..b55d90907d 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target @@ -1,6 +1,6 @@ [Unit] Description=Power%i (On) -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target After=obmc-power-start@%i.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target index 1a1ea63191..2b5fdbbd75 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i On (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target index a977d5ad3c..720548e2d5 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i On After=obmc-power-start-pre@%i.target -Wants={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target index 50d5050bb5..5460914b29 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target @@ -1,7 +1,7 @@ [Unit] Description=Power%i Off (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target +After=multi-user.target Wants=obmc-host-stopped@%i.target After=obmc-host-stopped@%i.target Conflicts=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target index f0429d7865..fc22eb1f34 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/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={SYSTEMD_DEFAULT_TARGET} +Wants=multi-user.target Conflicts=obmc-chassis-poweron@%i.target Conflicts=fsi-disable.service RefuseManualStart=yes |