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-22 12:19:42 +0100 |
commit | fc91e068cc38f8990571526c723292ad03b5c2d4 (patch) | |
tree | 0a9ca0abbb8b2b85132a4019f4f74be3988f6467 /meta/recipes-extended/pam/libpam_1.1.6.bb | |
parent | 42095866ec1aee5277441ff97d03c9f163fe22b0 (diff) | |
download | poky-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/pam/libpam_1.1.6.bb')
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 4 |
1 files changed, 4 insertions, 0 deletions
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 | ||
107 | python do_pam_sanity () { | 111 | python do_pam_sanity () { |