From 05dcac98473402d87e0af73bbc2c5a6a840abe93 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 29 Aug 2022 16:56:29 +0800 Subject: postgresql: make sure pam conf installed when pam enabled Update the pam check logic to make sure pam conf installed. Before the patch: root@intel-x86-64:~# rpm -ql postgresql | grep pam.d | grep postgresql root@intel-x86-64:~# After the patch: root@intel-x86-64:~# rpm -ql postgresql | grep pam.d | grep postgresql /etc/pam.d/postgresql root@intel-x86-64:~# Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit a755af4fb5ca2e158b00214bb18e27ba69c200fd) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/postgresql/postgresql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index bef33e6bb4..60d44ce979 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -205,7 +205,7 @@ do_install:append() { # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} - if [ "${@d.getVar('enable_pam')}" = "pam" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/pam.d install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql fi -- cgit 1.2.3-korg