Drop patches to make logind D-Bus activatable

The cgroup handling has been reworked in v205 and logind no longer
creates cgroup hierarchies on its own. That means that the standalone
logind is no longer functional without support from systemd (or an
equivalent cgroup manager).

diff --git a/debian/changelog b/debian/changelog
index cbd2f83c0f1fa42bbc862bbc813705317ece3138..752d71c61313e4315a9161c015b39f845eddcadb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ systemd (208-1) UNRELEASED; urgency=medium
   * Adjust systemd-user pam config file for Debian.
     This pam config file is used by libpam-systemd/systemd-logind when
     launching systemd user instances.
+  * Drop patches to make logind D-Bus activatable. The cgroup handling has
+    been reworked in v205 and logind no longer creates cgroup hierarchies on
+    its own. That means that the standalone logind is no longer functional
+    without support from systemd (or an equivalent cgroup manager).
 
   [ Martin Pitt ]
   * Explain patch management in debian/README.source.

diff --git a/debian/patches/Launch-logind-via-a-shell-wrapper.patch b/debian/patches/Launch-logind-via-a-shell-wrapper.patch
deleted file mode 100644 (file)
index 41be490..0000000
--- a/debian/patches/Launch-logind-via-a-shell-wrapper.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 18 Jul 2013 20:49:14 +0200
-Subject: Launch logind via a shell wrapper
-
-We need to setup the cgroupfs mount and the runtime directory before
-starting logind. Use a shell script which is triggered by the D-Bus
-service.
----
- src/login/org.freedesktop.login1.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service
-index d10f631..82c007e 100644
---- a/src/login/org.freedesktop.login1.service
-+++ b/src/login/org.freedesktop.login1.service
-@@ -7,6 +7,6 @@
- 
- [D-BUS Service]
- Name=org.freedesktop.login1
--Exec=/lib/systemd/systemd-logind
-+Exec=/lib/systemd/systemd-logind-launch
- User=root
- SystemdService=dbus-org.freedesktop.login1.service

diff --git a/debian/patches/Make-hostnamed-localed-timedated-D-Bus-activatable.patch b/debian/patches/Make-hostnamed-localed-timedated-D-Bus-activatable.patch
new file mode 100644 (file)
index 0000000..10e8cd1
--- /dev/null
+++ b/debian/patches/Make-hostnamed-localed-timedated-D-Bus-activatable.patch
@@ -0,0 +1,48 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Thu, 18 Jul 2013 20:31:49 +0200
+Subject: Make hostnamed/localed/timedated D-Bus activatable
+
+We want to use those services outside of systemd, so we make them
+activatable via D-Bus.
+---
+ src/hostname/org.freedesktop.hostname1.service | 2 +-
+ src/locale/org.freedesktop.locale1.service     | 2 +-
+ src/timedate/org.freedesktop.timedate1.service | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service
+index 6041ed6..7d923a5 100644
+--- a/src/hostname/org.freedesktop.hostname1.service
++++ b/src/hostname/org.freedesktop.hostname1.service
+@@ -7,6 +7,6 @@
+ 
+ [D-BUS Service]
+ Name=org.freedesktop.hostname1
+-Exec=/bin/false
++Exec=/lib/systemd/systemd-hostnamed
+ User=root
+ SystemdService=dbus-org.freedesktop.hostname1.service
+diff --git a/src/locale/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service
+index 025f9a0..8abbbfe 100644
+--- a/src/locale/org.freedesktop.locale1.service
++++ b/src/locale/org.freedesktop.locale1.service
+@@ -7,6 +7,6 @@
+ 
+ [D-BUS Service]
+ Name=org.freedesktop.locale1
+-Exec=/bin/false
++Exec=/lib/systemd/systemd-localed
+ User=root
+ SystemdService=dbus-org.freedesktop.locale1.service
+diff --git a/src/timedate/org.freedesktop.timedate1.service b/src/timedate/org.freedesktop.timedate1.service
+index 875f4be..198777d 100644
+--- a/src/timedate/org.freedesktop.timedate1.service
++++ b/src/timedate/org.freedesktop.timedate1.service
+@@ -7,6 +7,6 @@
+ 
+ [D-BUS Service]
+ Name=org.freedesktop.timedate1
+-Exec=/bin/false
++Exec=/lib/systemd/systemd-timedated
+ User=root
+ SystemdService=dbus-org.freedesktop.timedate1.service

diff --git a/debian/patches/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch b/debian/patches/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch
deleted file mode 100644 (file)
index a3f509a..0000000
--- a/debian/patches/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 18 Jul 2013 20:31:49 +0200
-Subject: Make logind/hostnamed/localed/timedated D-Bus activatable
-
-We want to use those services outside of systemd, so we make them
-activatable via D-Bus.
----
- src/hostname/org.freedesktop.hostname1.service | 2 +-
- src/locale/org.freedesktop.locale1.service     | 2 +-
- src/login/org.freedesktop.login1.service       | 2 +-
- src/timedate/org.freedesktop.timedate1.service | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service
-index 6041ed6..7d923a5 100644
---- a/src/hostname/org.freedesktop.hostname1.service
-+++ b/src/hostname/org.freedesktop.hostname1.service
-@@ -7,6 +7,6 @@
- 
- [D-BUS Service]
- Name=org.freedesktop.hostname1
--Exec=/bin/false
-+Exec=/lib/systemd/systemd-hostnamed
- User=root
- SystemdService=dbus-org.freedesktop.hostname1.service
-diff --git a/src/locale/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service
-index 025f9a0..8abbbfe 100644
---- a/src/locale/org.freedesktop.locale1.service
-+++ b/src/locale/org.freedesktop.locale1.service
-@@ -7,6 +7,6 @@
- 
- [D-BUS Service]
- Name=org.freedesktop.locale1
--Exec=/bin/false
-+Exec=/lib/systemd/systemd-localed
- User=root
- SystemdService=dbus-org.freedesktop.locale1.service
-diff --git a/src/login/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service
-index 762dae2..d10f631 100644
---- a/src/login/org.freedesktop.login1.service
-+++ b/src/login/org.freedesktop.login1.service
-@@ -7,6 +7,6 @@
- 
- [D-BUS Service]
- Name=org.freedesktop.login1
--Exec=/bin/false
-+Exec=/lib/systemd/systemd-logind
- User=root
- SystemdService=dbus-org.freedesktop.login1.service
-diff --git a/src/timedate/org.freedesktop.timedate1.service b/src/timedate/org.freedesktop.timedate1.service
-index 875f4be..198777d 100644
---- a/src/timedate/org.freedesktop.timedate1.service
-+++ b/src/timedate/org.freedesktop.timedate1.service
-@@ -7,6 +7,6 @@
- 
- [D-BUS Service]
- Name=org.freedesktop.timedate1
--Exec=/bin/false
-+Exec=/lib/systemd/systemd-timedated
- User=root
- SystemdService=dbus-org.freedesktop.timedate1.service

diff --git a/debian/patches/Start-logind-on-demand-via-libpam-systemd.patch b/debian/patches/Start-logind-on-demand-via-libpam-systemd.patch
deleted file mode 100644 (file)
index ab4b377..0000000
--- a/debian/patches/Start-logind-on-demand-via-libpam-systemd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 18 Jul 2013 20:36:39 +0200
-Subject: Start logind on demand via libpam-systemd
-
-Don't make pam_sm_open_session() a NOP if logind is not running. Trying
-to access logind via D-Bus will start it on demand.
----
- src/login/pam-module.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 49296b5..2c90ce3 100644
---- a/src/login/pam-module.c
-+++ b/src/login/pam-module.c
-@@ -201,10 +201,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
- 
-         /* pam_syslog(handle, LOG_INFO, "pam-systemd initializing"); */
- 
--        /* Make this a NOP on non-logind systems */
--        if (!logind_running())
--                return PAM_SUCCESS;
--
-         if (parse_argv(handle,
-                        argc, argv,
-                        &class_pam,
-@@ -261,7 +257,8 @@ _public_ PAM_EXTERN int pam_sm_open_session(
- 
-         bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-         if (!bus) {
--                pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
-+                if (debug)
-+                        pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
-                 r = PAM_SESSION_ERR;
-                 goto finish;
-         }

diff --git a/debian/patches/pam-Check-XDG_RUNTIME_DIR-owner.patch b/debian/patches/pam-Check-XDG_RUNTIME_DIR-owner.patch
index 23e56fb0fcce405c9cc9f1731cfcde6afe492b60..c0dcd43e0795ddf1a00ef95300102ef6bed933a8 100644 (file)
--- a/debian/patches/pam-Check-XDG_RUNTIME_DIR-owner.patch
+++ b/debian/patches/pam-Check-XDG_RUNTIME_DIR-owner.patch
@@ -27,7 +27,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1197395
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 2c90ce3..4dc96fd 100644
+index 49296b5..b5862a8 100644
 --- a/src/login/pam-module.c
 +++ b/src/login/pam-module.c
 @@ -194,6 +194,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
@@ -38,7 +38,7 @@ index 2c90ce3..4dc96fd 100644
  
          assert(handle);
  
-@@ -405,11 +406,25 @@ _public_ PAM_EXTERN int pam_sm_open_session(
+@@ -408,11 +409,25 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                  goto finish;
          }
  

diff --git a/debian/patches/series b/debian/patches/series
index 1f8d4503048251f6b03f7fe6c19f9cac6173c056..353c09f13204a594dcadfe93f9d06fad33addf1a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,9 +11,7 @@ timedated-don-t-rely-on-usr-being-mounted-in-the-ini.patch
 fstab-generator-don-t-rely-on-usr-being-mounted-in-t.patch
 man-fix-reference-in-systemd-inhibit-1.patch
 fix-remaining-reference-to-systemd-logind.conf.patch
-Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch
-Launch-logind-via-a-shell-wrapper.patch
-Start-logind-on-demand-via-libpam-systemd.patch
+Make-hostnamed-localed-timedated-D-Bus-activatable.patch
 Update-localed-to-use-the-Debian-config-files.patch
 Add-note-to-udev.conf-that-changes-to-that-file-requ.patch
 Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch