From efb04a1963ee03f7db756cb33ae52f024ffda086 Mon Sep 17 00:00:00 2001 From: "Josh D. King" Date: Thu, 6 Apr 2017 15:56:37 -0500 Subject: Refactor action target names Host-start-stop The target change is: obmc-chassis-stop -> obmc-host-stop obmc-chassis-start -> obmc-host-start Removed CHASSIS_FMT and CHASSIS_LINK_FMT because they are no longer needed. CHASSIS_POWER_FMT_2 did not change because its used for obmc-chassis-reset. Deleted files obmc-chassis-start@.target and obmc-chassis-stop@.target because they are no longer needed. I moved over their contents to obmc-host-start and obmc-host-stop. Updated phosphor-state-manager.bb and skeleton-rev.bbclass to have correct commit id. Change-Id: I26cba4153038f39d60e8d450a05969a216848abe Signed-off-by: Josh D. King --- .../host/op-host-control/start_host@.service | 8 +-- .../common/recipes-phosphor/host/p9-host-start.bb | 2 +- .../inventory-upload/inventory-upload.bb | 2 +- .../inventory-upload/op-inventory-upload@.service | 4 +- .../recipes-phosphor/fans/fan-default-speed.bb | 2 +- .../fan-default-speed/fan-default-speed@.service | 4 +- .../recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../chassis/avsbus-control/avsbus-disable@.service | 4 +- .../chassis/avsbus-control/avsbus-enable@.service | 2 +- .../refclock-fixup/op-refclock-fixup@.service | 2 +- .../recipes-phosphor/chassis/vcs-control.bb | 2 +- .../chassis/vcs-control/vcs-off@.service | 4 +- .../chassis/vcs-control/vcs-on@.service | 2 +- meta-phosphor/classes/skeleton-rev.bbclass | 2 +- .../common/recipes-core/systemd/obmc-targets.bb | 68 ++++++++-------------- .../obmc-targets/obmc-chassis-powerreset@.target | 7 +++ .../obmc-targets/obmc-chassis-reset@.target | 7 --- .../obmc-targets/obmc-chassis-start@.target | 10 ---- .../systemd/obmc-targets/obmc-chassis-stop@.target | 10 ---- .../systemd/obmc-targets/obmc-host-quiesce@.target | 6 ++ .../obmc-targets/obmc-host-start-pre@.target | 2 +- .../systemd/obmc-targets/obmc-host-start@.target | 9 ++- .../systemd/obmc-targets/obmc-host-started@.target | 4 +- .../obmc-targets/obmc-host-starting@.target | 8 +++ .../obmc-targets/obmc-host-stop-pre@.target | 2 +- .../systemd/obmc-targets/obmc-host-stop@.target | 9 ++- .../systemd/obmc-targets/obmc-host-stopped@.target | 2 +- .../obmc-targets/obmc-host-stopping@.target | 8 +++ .../systemd/obmc-targets/obmc-quiesce-host@.target | 6 -- .../systemd/obmc-targets/obmc-stop-host@.target | 2 +- .../chassis/obmc-op-control-power.bb | 4 +- .../obmc-op-control-power/op-power-start@.service | 2 +- .../obmc-op-control-power/op-power-stop@.service | 2 +- .../op-wait-power-off@.service | 2 +- .../op-wait-power-on@.service | 2 +- .../recipes-phosphor/chassis/obmc-pcie-detect.bb | 2 +- .../obmc-pcie-detect/pcie-slot-detect@.service | 4 +- .../recipes-phosphor/chassis/obmc-watchdog.bb | 4 +- .../obmc-watchdog/obmc-start-watchdog@.service | 4 +- .../obmc-watchdog/obmc-stop-watchdog@.service | 4 +- .../recipes-phosphor/fans/phosphor-fan-presence.bb | 4 +- .../phosphor-fan-presence-tach@.service | 4 +- .../recipes-phosphor/host/obmc-op-control-host.bb | 2 +- .../op-reset-host-running@.service | 2 +- .../obmc-op-control-host/op-start-host@.service | 8 +-- 45 files changed, 116 insertions(+), 136 deletions(-) create mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target delete mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target delete mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target delete mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target create mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target create mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target create mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target delete mode 100644 meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service index 14f816ee7..af26186c3 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service @@ -1,12 +1,12 @@ [Unit] Description=Start host%i SBE After=obmc-host-start-pre@%i.target -Wants=obmc-host-start@%i.target -Before=obmc-host-start@%i.target +Wants=obmc-host-starting@%i.target +Before=obmc-host-starting@%i.target Before=obmc-host-started@%i.target Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] @@ -15,4 +15,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb index 0caa074d4..0d7d534ed 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}" TMPL = "start_host@.service" INSTFMT = "start_host@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb index 03a63e502..bab0b63fa 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" TMPL = "op-inventory-upload@.service" INSTFMT = "op-inventory-upload@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service index 39c1cfc85..2da73e3da 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service @@ -2,7 +2,7 @@ Description=Inventory Upload Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Restart=no @@ -12,4 +12,4 @@ ExecStart={sbindir}/inventory_upload.py Environment="PYTHONUNBUFFERED=1" [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb index c98af0b46..fe45e7499 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb @@ -13,7 +13,7 @@ SRC_URI += "file://set_fan_speeds.sh" TMPL = "fan-default-speed@.service" INSTFMT = "fan-default-speed@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service index d968fefc6..5e38cec33 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service @@ -5,7 +5,7 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] ExecStart={bindir}/set_fan_speeds.sh 8000 @@ -13,4 +13,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index d5843924e..29f36a4f2 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -9,7 +9,7 @@ TMPL_OFF = "avsbus-disable@.service" TMPL_ON = "avsbus-enable@.service" INSTFMT_OFF = "avsbus-disable@{0}.service" INSTFMT_ON = "avsbus-enable@{0}.service" -TGTFMT_OFF = "obmc-chassis-stop@{0}.target" +TGTFMT_OFF = "obmc-host-stop@{0}.target" TGTFMT_ON = "obmc-chassis-poweron@{0}.target" FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 8561bf2db..51eec7f69 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -2,7 +2,7 @@ Description=Disable AVSBus on VRMs Wants=obmc-power-stop-pre@%i.target Before=obmc-power-stop-pre@%i.target -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] @@ -11,4 +11,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 0f786a624..b945529ac 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -2,7 +2,7 @@ Description=Enable AVSBus on VRMs Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service index 4b4383474..3c70afddb 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service @@ -5,7 +5,7 @@ Before=obmc-host-start-pre@%i.target Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Before=vcs_workaround@%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Restart=no diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 33b646f04..98fb89b5c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -12,7 +12,7 @@ TMPL_OFF = "vcs-off@.service" TMPL_ON = "vcs-on@.service" INSTFMT_OFF = "vcs-off@{0}.service" INSTFMT_ON = "vcs-on@{0}.service" -TGTFMT_OFF = "obmc-chassis-stop@{0}.target" +TGTFMT_OFF = "obmc-host-stop@{0}.target" TGTFMT_ON = "obmc-chassis-poweron@{0}.target" FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service index 3acbcf81c..1ca6215a9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service @@ -2,7 +2,7 @@ Description=Turn VCS rails off Wants=obmc-power-stop-pre@%i.target Before=obmc-power-stop-pre@%i.target -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%i.target [Service] ExecStart={bindir}/zaius_vcs.sh off @@ -10,4 +10,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service index 919406014..74b8df397 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service @@ -4,7 +4,7 @@ Wants=vcs_workaround@%i.service After=vcs_workaround@%i.service Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] ExecStart={bindir}/zaius_vcs.sh on diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index 4d6eb8e3d..5b5694c35 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,2 +1,2 @@ -SRCREV ?= "b72169d0e60abb116aeb5bfe226b3c3f36758823" +SRCREV ?= "2a559546389d69b8505087f9ada92aaa1fec21b6" SKELETON_URI ?= "git://github.com/openbmc/skeleton" diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb index 265ea1e30..cf8cb02b8 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb @@ -7,60 +7,44 @@ inherit obmc-phosphor-systemd inherit obmc-phosphor-license inherit allarch -# Overall chassis and host control -# - start: Services to run to start the host -# - stop: Services to run to stop the host -CHASSIS_TARGETS = "start stop" - -# Synchronization targets +# Chassis power synchronization targets # - start-pre: Services to run before we start power on process # - start: Services to run to do the chassis power on # - on: Services to run once power is on # - stop-pre,stop,off: Same as above but applied to powering off # - reset-on: Services to check if chassis power is on after bmc reset -SYNCH_POWER_TARGETS = "start-pre start on stop-pre stop off reset-on" +CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on" -# Control chassis power +# Chassis action power targets # - on: Services to run to power on the chassis # - off: Services to run to power off the chassis -CHASSIS_POWER_TARGETS = "on off" - -#TODO - After target renames #1205, combine this with CHASSIS_POWER_TARGETS # - reset: Services to check chassis power state and update chassis "on" target -CHASSIS_POWER_TARGETS_2 = "reset" +CHASSIS_ACTION_TARGETS = "on off reset" # Track all host synchronization point targets -# - start-pre: Services to run before we start host boot -# - start: Services to run to do the host boot -# - started: Services to run once the host is booted -# - stop-pre,stop,stopped: Same as above but applied to shutting down the host -# - reset-running: Services to check if host is running after bmc reset -HOST_SYNCH_TARGETS = "start-pre start started stop-pre stop stopped reset-running" +# - start-pre: Services to run before we start host boot +# - starting: Services to run to do the host boot +# - started: Services to run once the host is booted +# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host +# - reset-running: Services to check if host is running after bmc reset +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 # - stop: Services to run to shutdown the host # - quiesce: Target to enter on host boot failure -HOST_ACTION_TARGETS = "stop quiesce" - -# TODO: openbmc/openbmc#1205 - Move this to standard host action targets -# - reset: Check host state and update host "start" target if host running -HOST_ACTION_TARGETS_2 = "reset" +# - reset: Services to check if host is running and update host "start" target +HOST_ACTION_TARGETS = "start stop quiesce reset" -CHASSIS_FMT = "obmc-chassis-{0}@.target" -SYNCH_POWER_FMT = "obmc-power-{0}@.target" -CHASSIS_POWER_FMT = "obmc-chassis-power{0}@.target" -CHASSIS_POWER_FMT_2 = "obmc-chassis-{0}@.target" +CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target" +CHASSIS_ACTION_FMT = "obmc-chassis-power{0}@.target" HOST_SYNCH_FMT = "obmc-host-{0}@.target" -HOST_ACTION_FMT = "obmc-{0}-host@.target" -HOST_ACTION_FMT_2 = "obmc-host-{0}@.target" +HOST_ACTION_FMT = "obmc-host-{0}@.target" -CHASSIS_LINK_FMT = "${CHASSIS_FMT}:obmc-chassis-{0}@{1}.target" -SYNCH_POWER_LINK_FMT = "${SYNCH_POWER_FMT}:obmc-power-{0}@{1}.target" -CHASSIS_POWER_LINK_FMT = "${CHASSIS_POWER_FMT}:obmc-chassis-power{0}@{1}.target" -CHASSIS_POWER_LINK_FMT_2 = "${CHASSIS_POWER_FMT_2}:obmc-chassis-{0}@{1}.target" +CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target" +CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-power{0}@{1}.target" HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target" -HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-{0}-host@{1}.target" -HOST_LINK_ACTION_FMT_2 = "${HOST_ACTION_FMT_2}:obmc-host-{0}@{1}.target" +HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target" SYSTEMD_SERVICE_${PN} += " \ obmc-mapper.target \ @@ -70,18 +54,12 @@ SYSTEMD_SERVICE_${PN} += " \ obmc-standby.target \ " -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_FMT', 'CHASSIS_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'SYNCH_POWER_FMT', 'SYNCH_POWER_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_POWER_FMT', 'CHASSIS_POWER_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_POWER_FMT_2', 'CHASSIS_POWER_TARGETS_2')}" +SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}" +SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}" SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT_2', 'HOST_ACTION_TARGETS_2')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_FMT', 'CHASSIS_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'SYNCH_POWER_LINK_FMT', 'SYNCH_POWER_TARGETS', 'OBMC_POWER_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_POWER_LINK_FMT', 'CHASSIS_POWER_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_POWER_LINK_FMT_2', 'CHASSIS_POWER_TARGETS_2', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT_2', 'HOST_ACTION_TARGETS_2', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target new file mode 100644 index 000000000..2ef6c7053 --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target @@ -0,0 +1,7 @@ +[Unit] +Description=Chassis%i (Reset Check) +Conflicts=obmc-chassis-poweroff%i.target +RefuseManualStop=yes + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target deleted file mode 100644 index 2ef6c7053..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Chassis%i (Reset Check) -Conflicts=obmc-chassis-poweroff%i.target -RefuseManualStop=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target deleted file mode 100644 index c54fea6ff..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Chassis%i (Start) -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-chassis-stop@%i.target -RefuseManualStop=yes -OnFailure=obmc-quiesce-host@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target deleted file mode 100644 index bc887b311..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Chassis%i (Stop) -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-chassis-start@%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-quiesce@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target new file mode 100644 index 000000000..4f10419ab --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target @@ -0,0 +1,6 @@ +[Unit] +Description=Quiesce Target +Wants={SYSTEMD_DEFAULT_TARGET} +After={SYSTEMD_DEFAULT_TARGET} +RefuseManualStop=yes +Conflicts=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target index d555d0a88..2bc270c14 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target @@ -2,6 +2,6 @@ Description=Start Host%i (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target index 5d309d2d3..317c6c14f 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target @@ -1,7 +1,10 @@ [Unit] Description=Start Host%i Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target -RefuseManualStart=yes +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-quiesce-host@%i.target +OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target index f5b1f2da1..45d898bef 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target @@ -1,8 +1,8 @@ [Unit] Description=Host%i (Started) Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-start@%i.target -Conflicts=obmc-chassis-stop@%i.target +After=obmc-host-starting@%i.target +Conflicts=obmc-host-stop@%i.target Conflicts=obmc-stop-host@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target new file mode 100644 index 000000000..51bce8db5 --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target @@ -0,0 +1,8 @@ +[Unit] +Description=Host%i (Starting) +Wants={SYSTEMD_DEFAULT_TARGET} +After=obmc-host-start-pre@%i.target +Conflicts=obmc-host-stop@%i.target +Conflicts=obmc-stop-host@%i.target +RefuseManualStart=yes +RefuseManualStop=yes 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 a97925087..208892fb6 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 @@ -2,6 +2,6 @@ Description=Stop Host%i (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%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 c573e9c5b..96648a40a 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 @@ -1,7 +1,10 @@ [Unit] Description=Stop Host%i Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-stop-pre@%i.target -Conflicts=obmc-chassis-start@%i.target -RefuseManualStart=yes +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 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 92afdf00f..1043578a6 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 @@ -2,6 +2,6 @@ Description=Host%i (Stopped) Wants={SYSTEMD_DEFAULT_TARGET} After=obmc-host-stop@%i.target -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%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 new file mode 100644 index 000000000..bc81a577f --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target @@ -0,0 +1,8 @@ +[Unit] +Description=Host%i (Stopping) +Wants={SYSTEMD_DEFAULT_TARGET} +After=obmc-host-stop-pre@%i.target +Conflicts=obmc-host-start@%i.target +Conflicts=obmc-host-starting@%i.target +RefuseManualStart=yes +RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target deleted file mode 100644 index 4f10419ab..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Quiesce Target -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -RefuseManualStop=yes -Conflicts=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target index 4347fa426..9e7defe69 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target @@ -2,5 +2,5 @@ Description=Power%i Host Off Wants={SYSTEMD_DEFAULT_TARGET} RefuseManualStop=yes -OnFailure=obmc-chassis-stop@%i.target +OnFailure=obmc-host-stop@%i.target OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index 44421bd92..2672335d4 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -66,13 +66,13 @@ SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWE # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target" +START_TGTFMT_CTRL = "obmc-host-start@{1}.target" START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" STOP_TMPL_CTRL = "obmc-chassis-poweroff@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target" +STOP_TGTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index f76695e7b..befc89296 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service @@ -15,4 +15,4 @@ Type=oneshot ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1 [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service index 86ddf4a32..dd3570e01 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service @@ -12,4 +12,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0 [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service index 32ae6942d..a5efb4133 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service @@ -14,4 +14,4 @@ ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i off ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service index 1c85fc1b9..cd4f513a0 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service @@ -15,4 +15,4 @@ ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i on TimeoutSec=30 [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb index 7af067ffb..b0709587a 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb @@ -8,7 +8,7 @@ inherit obmc-phosphor-systemd SKELETON_DIR = "pciedetect" TMPL = "pcie-slot-detect@.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" INSTFMT = "pcie-slot-detect@{0}.service" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service index 532d5e9bf..6cc65f892 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service @@ -2,7 +2,7 @@ Description=PCIE Slot Presence Detection For Chassis%i Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Type=oneshot @@ -10,4 +10,4 @@ RemainAfterExit=yes ExecStart={sbindir}/pcie_slot_present.exe [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb index 77017e31c..d065d631b 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb @@ -12,12 +12,12 @@ DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_WATCHDOG_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.service" START_TMPL = "obmc-start-watchdog@.service" -START_TGTFMT = "obmc-chassis-start@{1}.target" +START_TGTFMT = "obmc-host-start@{1}.target" START_INSTFMT = "obmc-start-watchdog@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" STOP_TMPL = "obmc-stop-watchdog@.service" -STOP_TGTFMT = "obmc-chassis-stop@{1}.target" +STOP_TGTFMT = "obmc-host-stop@{1}.target" STOP_INSTFMT = "obmc-stop-watchdog@{0}.service" STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service index d28bfe839..77ed037a5 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service @@ -4,7 +4,7 @@ Wants=obmc-host-started@%i.target After=obmc-host-started@%i.target Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] @@ -14,4 +14,4 @@ ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdo ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog start [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service index 2b086cf2c..d1494036f 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service @@ -2,7 +2,7 @@ Description=Stop Watchdog%i Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%i.target [Service] Type=oneshot @@ -10,4 +10,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog stop [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb index a064cf1b0..201849a08 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb @@ -34,10 +34,10 @@ RDEPENDS_${PN}-tach += "sdbusplus" RDEPENDS_phosphor-chassis-cooling-type += "libevdev" -# Needed to install into the obmc-chassis-start target +# Needed to install into the obmc-host-start target TMPL = "phosphor-fan-presence-tach@.service" INSTFMT = "phosphor-fan-presence-tach@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" FILES_${PN}-tach = "${sbindir}/phosphor-fan-presence-tach" diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service index ac153895e..8324fdb0c 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service @@ -2,11 +2,11 @@ Description=Phosphor Fan Presence Tach Daemon Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Restart=on-failure ExecStart={sbindir}/phosphor-fan-presence-tach [Install] -RequiredBy=obmc-chassis-start@%i.target +RequiredBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb index fa5a00656..8533c8eab 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb @@ -19,7 +19,7 @@ SYSTEMD_SERVICE_${PN} = " \ " START_TMPL = "op-start-host@.service" -START_TGTFMT = "obmc-chassis-start@{1}.target" +START_TGTFMT = "obmc-host-start@{1}.target" START_INSTFMT = "obmc-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service index 7f3871efc..9a6ffe60b 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service @@ -7,7 +7,7 @@ ConditionPathExists=/run/openbmc/host@%i-on [Service] RemainAfterExit=no # TODO: openbmc/openbmc#1205 - target name refactor -ExecStart=/bin/systemctl start obmc-chassis-start@%i.target +ExecStart=/bin/systemctl start obmc-host-start@%i.target [Install] diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service index 8c5cfbb5d..c9d1a7c5c 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service @@ -1,14 +1,14 @@ [Unit] Description=Start Host%i After=obmc-host-start-pre@%i.target -Wants=obmc-host-start@%i.target -Before=obmc-host-start@%i.target +Wants=obmc-host-starting@%i.target +Before=obmc-host-starting@%i.target Before=obmc-host-started@%i.target Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Wants=mapper-wait@-org-openbmc-control-host%i.service After=mapper-wait@-org-openbmc-control-host%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] @@ -17,4 +17,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target -- cgit v1.2.1