diff options
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
13 files changed, 20 insertions, 20 deletions
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 |
