diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2019-10-16 11:40:01 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2019-11-18 12:46:29 +0200 |
| commit | c454e1e099d006f1f62d2d8de342b5a9c51275c8 (patch) | |
| tree | be613b4bbe29f85747e5681824de61b200300d43 | |
| parent | c1010a6326b555c0ebb55b3d57b3d0591b5d4d2c (diff) | |
| download | rpm-c454e1e099d006f1f62d2d8de342b5a9c51275c8.tar.gz | |
Revert "Fully shutdown DBUS on systemd_inhibit cleanup (RhBug:1714657)"
Turns out this isn't a safe thing to do, as an API user could have
their own dbus connections in the same process and shutting those
down is a rather impolite thing to do (and causes crash, burn and
other injuries, eg RhBug:1750575)
This reverts commit d5f201345f6d27b6280750e5c6502f4418614fbc.
(cherry picked from commit 9b512ac829a01157feb45124d22e35747eff7125)
| -rw-r--r-- | plugins/systemd_inhibit.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/systemd_inhibit.c b/plugins/systemd_inhibit.c index 9cb722761..0ddca9cd8 100644 --- a/plugins/systemd_inhibit.c +++ b/plugins/systemd_inhibit.c @@ -82,11 +82,6 @@ static rpmRC systemd_inhibit_init(rpmPlugin plugin, rpmts ts) return RPMRC_NOTFOUND; } -static void systemd_inhibit_cleanup(rpmPlugin plugin) -{ - dbus_shutdown(); -} - static rpmRC systemd_inhibit_tsm_pre(rpmPlugin plugin, rpmts ts) { if (rpmtsFlags(ts) & (RPMTRANS_FLAG_TEST|RPMTRANS_FLAG_BUILD_PROBS)) @@ -113,7 +108,6 @@ static rpmRC systemd_inhibit_tsm_post(rpmPlugin plugin, rpmts ts, int res) struct rpmPluginHooks_s systemd_inhibit_hooks = { .init = systemd_inhibit_init, - .cleanup = systemd_inhibit_cleanup, .tsm_pre = systemd_inhibit_tsm_pre, .tsm_post = systemd_inhibit_tsm_post, }; |