diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-09-19 16:03:21 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-20 12:17:13 +0100 |
| commit | 3ccb0855a7a6b147e5025855c6376747ba72986a (patch) | |
| tree | 7a384f9ea2a9a01e3c281f122b1cf642306ddd4d /meta/recipes-extended | |
| parent | e5443a0b5a70bf054cbeb6ff1fd6b5ef9d2347f8 (diff) | |
| download | openembedded-core-3ccb0855a7a6b147e5025855c6376747ba72986a.tar.gz openembedded-core-3ccb0855a7a6b147e5025855c6376747ba72986a.tar.bz2 openembedded-core-3ccb0855a7a6b147e5025855c6376747ba72986a.zip | |
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>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/pam/libpam/pam.d/common-session | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 4 |
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 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 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() { # 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 () { |