diff options
Diffstat (limited to 'meta-phosphor/common/recipes-core')
7 files changed, 22 insertions, 7 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb index 26fbcd1f6..ac7835e6b 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb @@ -32,7 +32,12 @@ CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff" HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running" # Track all host action targets -# - start: Service to run to start the host +# - start: Will run startmin target, this target used for any additional +# services that user needs for an initial power on of host. +# For example, resetting the host reboot count could be put in +# this target so on any fresh power on, this count is reset. +# - startmin: Minimum services required to start the host. This target will +# be called by reboot and start target. # - stop: Services to run to shutdown the host # - quiesce: Target to enter on host boot failure # - shutdown: Tell host to shutdown, then stop system @@ -42,7 +47,7 @@ HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset # multiple services and one of them is the quiesce target. # - timeout: Target to run when host watchdog times out # - reboot: Reboot the host -HOST_ACTION_TARGETS = "start stop quiesce reset shutdown crash timeout reboot" +HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout reboot" CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target" CHASSIS_ACTION_FMT = "obmc-chassis-{0}@.target" diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target index 5ee53ae29..dc280ea65 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target @@ -4,7 +4,7 @@ Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} Wants=mapper-wait@-org-openbmc-control-chassis%i.service After=mapper-wait@-org-openbmc-control-chassis%i.service -Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-startmin@%i.target RefuseManualStop=yes OnFailure=obmc-chassis-poweroff@%i.target OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target new file mode 100644 index 000000000..6e924adcd --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target @@ -0,0 +1,10 @@ +[Unit] +Description=Start Host%i Minimum +Wants={SYSTEMD_DEFAULT_TARGET} +After={SYSTEMD_DEFAULT_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 +RefuseManualStop=yes +OnFailure=obmc-host-quiesce@%i.target +OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target index 75afd4339..e88d3ea58 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target @@ -3,6 +3,6 @@ Description=Stop Host%i (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} Before=obmc-host-stopping@%i.target -Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-startmin@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target index 6353e74da..8e99bccdb 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target @@ -5,7 +5,7 @@ After={SYSTEMD_DEFAULT_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 -Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-startmin@%i.target RefuseManualStop=yes OnFailure=obmc-chassis-poweroff@%i.target OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target index d3efca58f..74039fc25 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target @@ -4,6 +4,6 @@ Wants={SYSTEMD_DEFAULT_TARGET} Wants=obmc-host-stopping@%i.target After=obmc-host-stopping@%i.target Before=obmc-power-stop-pre@%i.target -Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-startmin@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target index 6209c52b1..f087dea72 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target @@ -4,7 +4,7 @@ Wants={SYSTEMD_DEFAULT_TARGET} Wants=obmc-host-stop-pre@%i.target After=obmc-host-stop-pre@%i.target Before=obmc-host-stopped@%i.target -Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-startmin@%i.target Conflicts=obmc-host-starting@%i.target RefuseManualStart=yes RefuseManualStop=yes |