From 20c4bef47497c5441b33d9d172803185f0138961 Mon Sep 17 00:00:00 2001
From: Adrian Szyndela <adrian.s@samsung.com>
Date: Fri, 6 Mar 2020 17:17:47 +0100
Subject: [PATCH] Revert "Drop dbus activation stub service"

This reverts commit 07125d24eedb71693b3bf2b1f0730cd01aaac2dd.

The revert may be reverted with dbus update to version >= 1.10.10.
---
 README                                    |  4 +++-
 src/core/meson.build                      |  2 ++
 src/core/org.freedesktop.systemd1.service | 13 +++++++++++++
 units/meson.build                         |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/core/org.freedesktop.systemd1.service

diff --git a/README b/README
index 98da2d6..fcf20ed 100644
--- a/README
+++ b/README
@@ -173,7 +173,9 @@ REQUIREMENTS:
         dependencies:
 
         util-linux >= v2.27.1 required
-        dbus >= 1.11.0 (strictly speaking optional, but recommended)
+        dbus >= 1.4.0 (strictly speaking optional, but recommended)
+                NOTE: If using dbus < 1.9.18, you should override the default
+                policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d).
         dracut (optional)
         polkit (optional)
 
diff --git a/src/core/meson.build b/src/core/meson.build
index bd68103..9cd72f5 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -204,6 +204,8 @@ endforeach
 
 install_data('org.freedesktop.systemd1.conf',
              install_dir : dbuspolicydir)
+install_data('org.freedesktop.systemd1.service',
+             install_dir : dbussystemservicedir)
 
 policy = configure_file(
         input : 'org.freedesktop.systemd1.policy.in',
diff --git a/src/core/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service
new file mode 100644
index 0000000..8bd7302
--- /dev/null
+++ b/src/core/org.freedesktop.systemd1.service
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[D-BUS Service]
+Name=org.freedesktop.systemd1
+Exec=/bin/false
+User=root
diff --git a/units/meson.build b/units/meson.build
index 5f8e74e..45c5e86 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -320,6 +320,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(
-- 
2.7.4