Commit 867a2d67 authored by Martin Pitt's avatar Martin Pitt
Browse files

Reinstate patches to make logind D-BUS activatable

parent 9b81d900
......@@ -32,6 +32,7 @@ systemd (208-7) UNRELEASED; urgency=medium
* 75-persistent-net-generator.rules: Adjust Ravello interfaces; they don't
violate the assignment schema, they should just not be persistent.
Thanks to Boris Figovsky. (Closes: #747475, LP: #1317776)
* Reinstate patches to make logind D-BUS activatable.
-- Michael Biebl <biebl@debian.org> Thu, 17 Jul 2014 00:48:14 +0200
......
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
From: Michael Biebl <biebl@debian.org>
Date: Thu, 18 Jul 2013 20:31:49 +0200
Subject: Make hostnamed/localed/timedated D-Bus activatable
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 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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
......@@ -34,6 +35,18 @@ index 025f9a0..8abbbfe 100644
+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
......
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(-)
Index: systemd/src/login/pam-module.c
===================================================================
--- systemd.orig/src/login/pam-module.c
+++ systemd/src/login/pam-module.c
@@ -191,10 +191,6 @@ _public_ PAM_EXTERN int pam_sm_open_sess
dbus_error_init(&error);
- /* Make this a NOP on non-logind systems */
- if (!logind_running())
- return PAM_SUCCESS;
-
if (parse_argv(handle,
argc, argv,
&class_pam,
@@ -254,7 +250,8 @@ _public_ PAM_EXTERN int pam_sm_open_sess
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;
}
......@@ -492,7 +492,9 @@ Run-update-rc.d-defaults-before-update-rc.d-enable-d.patch
don-t-try-to-start-autovt-units-when-not-running-wit.patch
timedated-don-t-rely-on-usr-being-mounted-in-the-ini.patch
fstab-generator-don-t-rely-on-usr-being-mounted-in-t.patch
Make-hostnamed-localed-timedated-D-Bus-activatable.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
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment