summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-19 16:03:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:42 +0100
commitfc91e068cc38f8990571526c723292ad03b5c2d4 (patch)
tree0a9ca0abbb8b2b85132a4019f4f74be3988f6467 /meta/recipes-extended
parent42095866ec1aee5277441ff97d03c9f163fe22b0 (diff)
downloadpoky-fc91e068cc38f8990571526c723292ad03b5c2d4.tar.gz
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 ] (From OE-Core rev: 3ccb0855a7a6b147e5025855c6376747ba72986a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/pam/libpam/pam.d/common-session2
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb4
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/pam/libpam/pam.d/common-session b/meta/recipes-extended/pam/libpam/pam.d/common-session
index 7fd61feea1..a4a551f711 100644
--- 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
17session required pam_permit.so 17session required pam_permit.so
18# and here are more per-package modules (the "Additional" block) 18# and here are more per-package modules (the "Additional" block)
19session required pam_unix.so 19session required pam_unix.so
20# Register with logind to make screen/tmux/etc work
21session 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 448a67b71b..f7493c595d 100644
--- 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() {
102 102
103 # The lsb requires unix_chkpwd has setuid permission 103 # The lsb requires unix_chkpwd has setuid permission
104 chmod 4755 ${D}${sbindir}/unix_chkpwd 104 chmod 4755 ${D}${sbindir}/unix_chkpwd
105
106 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
107 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
108 fi
105} 109}
106 110
107python do_pam_sanity () { 111python do_pam_sanity () {