From 01f149c02c90389f51f2c4eaf5519f9bf2aa57d0 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Sun, 25 Nov 2018 23:20:44 -0600 Subject: recipes-phosphor: Fix systemd unit dependences of ipmid, mboxd With the implementation of DBus and IPMI transports for the HIOMAP protocol, mboxd now depends on ipmid being alive in its shutdown sequence in order to propagate BMC status events to the host firmware. Mark phosphor-ipmi-host.service as depending on org.openbmc.HostIpmi.service and mboxd as depending on phosphor-ipmi-host.service to ensure the mboxd state update event on SIGTERM is propagated to the host before the services are torn down. (From meta-phosphor rev: e66105318af187ba5d4bdbf53668f309785df4f3) Change-Id: Ia9ff24d0d3376d239b56840d666275d20821c7e6 Signed-off-by: Andrew Jeffery Signed-off-by: Brad Bishop --- .../ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service | 2 ++ meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service index ef24bd0160..74f8218a9c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service @@ -11,6 +11,8 @@ Wants=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service Wants=clear-once.service After=clear-once.service +Requires=org.openbmc.HostIpmi.service +After=org.openbmc.HostIpmi.service [Service] Restart=always diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service index 35081d85ab..28e4ff4f3b 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd/mboxd.service @@ -4,7 +4,8 @@ BindsTo=dev-aspeed\x2dlpc\x2dctrl.device After=dev-aspeed\x2dlpc\x2dctrl.device BindsTo=dev-aspeed\x2dmbox.device After=dev-aspeed\x2dmbox.device - +Requires=phosphor-ipmi-host.service +After=phosphor-ipmi-host.service [Service] Restart=always -- cgit v1.2.3