diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2018-07-20 09:13:15 -0700 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-07-20 20:01:35 +0000 |
| commit | aad617f2cef143937204e78ee7b10da5d197420b (patch) | |
| tree | 454ba97a01f3dcaae17c8907004181d83017650d /meta-phosphor | |
| parent | 494894d69c88cf4909993227af2dd8f2ca938752 (diff) | |
| download | talos-openbmc-aad617f2cef143937204e78ee7b10da5d197420b.tar.gz talos-openbmc-aad617f2cef143937204e78ee7b10da5d197420b.zip | |
Add explicit dependency between mapper and sdbus
Mapper has an implicit dependency on dbus.socket but
not on dbus.service. It appears an explicit dependency
is required to ensure the shutdown happens correctly.
Testing: Prior to this commit you would see this on a reboot:
Jul 20 15:01:34 witherspoon systemd[1]: Stopping D-Bus System MessageBus...
Jul 20 15:01:36 witherspoon systemd[1]: Stopped D-Bus System MessageBus.
Jul 20 15:01:37 witherspoon systemd[1]: xyz.openbmc_project.ObjectMapper.service: Main process exited,code=exited, status=1/FAILURE
Jul 20 15:01:37 witherspoon systemd[1]: xyz.openbmc_project.ObjectMapper.service: Failed with result'exit-code'.
Jul 20 15:01:41 witherspoon systemd[1]: Closed D-Bus System Message Bus Socket.
This shows the dbus.service stopping before the ObjectMapper
With this fix, this is now seen:
Jul 20 17:38:20 witherspoon systemd[1]: Stopping Phosphor DBus Service Discovery Manager...
Jul 20 17:38:21 witherspoon systemd[1]: Stopped Phosphor DBus Service Discovery Manager.
Jul 20 17:38:21 witherspoon systemd[1]: Stopping D-Bus System Message Bus...
Jul 20 17:38:21 witherspoon systemd[1]: Stopped D-Bus System Message Bus.
Jul 20 17:38:21 witherspoon systemd[1]: Closed D-Bus System Message Bus Socket.
This shows ObjectMapper stopping prior to dbus.service
Resolves openbmc/openbmc#3319
Change-Id: I466ec45f4582b3242688e8308d156961bb79cdc1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service index 820a42b07..aeb734da7 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service @@ -1,6 +1,7 @@ [Unit] Description=Phosphor DBus Service Discovery Manager Before=obmc-mapper.target +After=dbus.service [Service] Restart=always |
