From 9f11e781f8706034121020f6b36c2118b30275e4 Mon Sep 17 00:00:00 2001
From: Mark Hindley <mark@hindley.org.uk>
Date: Fri, 9 Nov 2018 11:29:06 +0000
Subject: Disable Dbus activation by default. However, leave the Dbus service
 file so that a sysadmin could choose it, however unwisely.

---
 debian/changelog                                             |  6 ++++++
 debian/elogind.init                                          |  2 +-
 debian/elogind.install                                       |  7 +------
 debian/patches/Disable_Dbus_activation_by_default.diff.patch | 11 +++++++++++
 debian/patches/series                                        |  1 +
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 debian/patches/Disable_Dbus_activation_by_default.diff.patch

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index cbd0dfb14..358fe6b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+elogind (239.1-1+disable-dbus-activation~rc1) unstable; urgency=medium
+
+  * Disable Dbus activation by default.
+
+ -- Mark Hindley <mark@hindley.org.uk>  Fri, 09 Nov 2018 11:19:41 +0000
+
 elogind (239.1-1~rc1) unstable; urgency=medium
 
   * New upstream release v239.1.
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
-- 
cgit v1.2.3