diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-01-14 00:57:38 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-01-15 17:23:56 +0300 |
| commit | 18e712798fe29b834a2eb075f45278eeaeb1ec5a (patch) | |
| tree | 60cb6b1c0b450108e23bca85601ed34dd1031e1c | |
| parent | 01f292d6c35473d122a77741b9a639131a2b51f0 (diff) | |
| download | openbmc-18e712798fe29b834a2eb075f45278eeaeb1ec5a.tar.xz | |
warm-reboot: mbox reset with host start
As preparation for warm reboot starts (reboot host while keeping the
chassis power on), need to ensure any services which are required to run
when the host is reboot are in the proper targets
The mbox reset is required when the host is rebooted so therefore this
service must be in the hoststartmin@.target
(From meta-phosphor rev: 7d75693c4e2a1a3690280c6ea6880eb67625d64c)
Change-Id: Ib4c42d363cf7ffa94b89b23b13c8adc6c6a10978
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service | 8 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service index be02c7a2c..8dcaafda8 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service @@ -1,10 +1,10 @@ [Unit] Description=Reload mboxd during power on -Wants=obmc-power-start-pre@%i.target -Before=obmc-power-start-pre@%i.target +Wants=obmc-host-start-pre@%i.target +Before=obmc-host-start-pre@%i.target Wants=mapper-wait@-org-openbmc-mboxd.service After=mapper-wait@-org-openbmc-mboxd.service -Conflicts=obmc-chassis-poweroff@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Type=oneshot @@ -13,4 +13,4 @@ ExecStart=/usr/bin/env mboxctl --reset SyslogIdentifier=mboxctl [Install] -WantedBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-host-startmin@%i.target diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index b5ee156a0..e203583a8 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -31,13 +31,13 @@ do_install_append() { } TMPL = "mboxd-reload@.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" +TGTFMT = "obmc-host-startmin@{0}.target" INSTFMT = "mboxd-reload@{0}.service" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "mboxd.service" SYSTEMD_SERVICE_${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" # Enable virtual-pnor by DISTRO_FEATURE openpower-ubi-fs. PACKAGECONFIG_append_df-openpower-ubi-fs = "virtual-pnor" |