libpam: only use pam_systemd.so if systemd is enabled

So that sysvinit images don't warn on every login only add it to common-session
if systemd is a DISTRO_FEATURE.

[ YOCTO #3805 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-session b/meta/recipes-extended/pam/libpam/pam.d/common-session
index 7fd61feea1bed4305538066572d81b6780888b94..a4a551f7112b48933786432b99ee85c8fe5c3ba1 100644 (file)
--- a/meta/recipes-extended/pam/libpam/pam.d/common-session
+++ b/meta/recipes-extended/pam/libpam/pam.d/common-session
@@ -17,5 +17,3 @@ session       requisite                       pam_deny.so
 session        required                        pam_permit.so
 # and here are more per-package modules (the "Additional" block)
 session        required        pam_unix.so
-# Register with logind to make screen/tmux/etc work
-session        optional        pam_systemd.so

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index 448a67b71b66ab35d454de3ee7dfbb3e2980c0f0..f7493c595d77f7ad4ad05b5e9c4418d8073442e5 100644 (file)
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -102,6 +102,10 @@ do_install() {
 
        # The lsb requires unix_chkpwd has setuid permission
        chmod 4755 ${D}${sbindir}/unix_chkpwd
+
+       if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+               echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
+       fi
 }
 
 python do_pam_sanity () {