Merge branch 'disable_dbus_activation_by_default' into merge_rc2

5 files changed, 15 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 859c51a5a..4bad31e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 elogind (239.1-1+debian1~rc2) unstable; urgency=medium
 
+  * Disable Dbus activation by default.
   * Use shutdown rather than poweroff as the latter is missing on runit systems.
   * Remove upstream pwx git submodule. Thanks to Ian Jackson.
 
diff --git a/debian/elogind.init b/debian/elogind.init
index e08335f91..2a1d36a7f 100644
--- a/debian/elogind.init
+++ b/debian/elogind.init
@@ -13,7 +13,7 @@ set -e
 
 # /etc/init.d/elogind: start and stop the elogind session management daemon
 
-ELOGIND=/usr/sbin/elogind
+ELOGIND=/lib/elogind/elogind
 
 test -x $ELOGIND || exit 0
 
diff --git a/debian/elogind.install b/debian/elogind.install
index 9cef24e61..300006403 100644
--- a/debian/elogind.install
+++ b/debian/elogind.install
@@ -1,11 +1,6 @@
 bin/
 etc/elogind/logind.conf
-lib/elogind/elogind /usr/sbin/
-lib/elogind/libelogind-shared*.so
-lib/elogind/elogind-cgroups-agent
-lib/elogind/elogind-uaccess-command
-lib/elogind/system-sleep/.keep_dir
-lib/elogind/system-shutdown/.keep_dir
+lib/elogind/
 lib/udev/rules.d/70-uaccess.rules
 lib/udev/rules.d/71-seat.rules
 lib/udev/rules.d/73-seat-late.rules
diff --git a/debian/patches/Disable_Dbus_activation_by_default.diff.patch b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
new file mode 100644
index 000000000..48d67330e
--- /dev/null
+++ b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
@@ -0,0 +1,11 @@
+--- a/src/login/org.freedesktop.login1.service.in
++++ b/src/login/org.freedesktop.login1.service.in
+@@ -7,5 +7,7 @@
+ 
+ [D-BUS Service]
+ Name=org.freedesktop.login1
+-Exec=@rootlibexecdir@/elogind --daemon
++# By default, Dbus activation of elogind is disabled. The daemon is started via an init script.
++# Exec=@rootlibexecdir@/elogind --daemon
++Exec=/bin/true
+ User=root
diff --git a/debian/patches/series b/debian/patches/series
index 33125a623..fb9c2028a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+Disable_Dbus_activation_by_default.diff.patch
 manpage-branding.diff
 Fix_glibc_program_invocation_name_pointer_overlap.diff