diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-12-20 12:26:17 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-12-20 17:28:12 +0100 |
| commit | b895fa08e6809ab54e20888f7d01ae848272e981 (patch) | |
| tree | c0a192b569270996efa1631ef68f8988c3bc20d7 /units | |
| parent | 1cb342447d92053ab1750e498b6591f3dd46f0f6 (diff) | |
| download | systemd-b895fa08e6809ab54e20888f7d01ae848272e981.tar.gz | |
Revert "Drop dbus activation stub service"
This reverts commit 07125d24eedb71693b3bf2b1f0730cd01aaac2dd.
In contrast to what is claimed in #13396 dbus-broker apparently does
care for the service file to be around, and otherwise will claim
"Service Not Activatable" in the time between systemd starting up the
broker and connecting to it, which the stub service file is supposed to
make go away.
Reverting this makes the integration test suite pass again on host with
dbus-broker (i.e. current Fedora desktop).
Tested with dbus-broker-21-6.fc31.x86_64.
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/units/meson.build b/units/meson.build index 9da60a431c..c809011fc5 100644 --- a/units/meson.build +++ b/units/meson.build @@ -310,6 +310,9 @@ install_data('user-.slice.d/10-defaults.conf', meson.add_install_script(meson_make_symlink, join_paths(pkgsysconfdir, 'user'), join_paths(sysconfdir, 'xdg/systemd/user')) +meson.add_install_script(meson_make_symlink, + join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), + join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) if conf.get('HAVE_SYSV_COMPAT') == 1 foreach i : [1, 2, 3, 4, 5] meson.add_install_script( |