Disable pam_systemd for non-interactive sessions to work around an issue with sudo.

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 836f04b7fe45f047ddae0b1bdc959bde4d3036be..ce73b9ea93e9aabc2b3e3fff289cc6cb303dcb4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ systemd (43-1) unstable; urgency=low
   * Stop installing lib-init-rw (auto)mount units and try to cleanup
     /lib/init/rw in postinst. Bump dependency on initscripts accordingly.
     Closes: #643699
+  * Disable pam_systemd for non-interactive sessions to work around an issue
+    with sudo.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Tue, 07 Feb 2012 21:36:34 +0100
 

diff --git a/debian/pam-configs/systemd b/debian/pam-configs/systemd
index b31ad4bed64fca19709f3f584c975ec359029170..5b56996a2bb77030fe11ee80e250f59081527aee 100644 (file)
--- a/debian/pam-configs/systemd
+++ b/debian/pam-configs/systemd
@@ -1,6 +1,7 @@
 Name: Register user sessions in the systemd control group hierarchy
 Default: yes
 Priority: 0
+Session-Interactive-Only: yes
 Session-Type: Additional
 Session:
        optional        pam_systemd.so