libpam: make volatile files created successfully
PATCH 1/1 libpam: make volatile files created successfully
From: Changqing Li <[email protected]>
Signed-off-by Changqing Li <[email protected]>
--- .../pam/libpam/pam-volatiles.conf | 1 + meta/recipes-extended/pam/libpam_1.5.1.bb | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/pam/libpam/pam-volatiles.conf
meta/recipes-extended/pam/libpam/pam-volatiles.conf new file +1 -0
@@ -0,0 +1 @@ +d /var/run/sepermit 0755 root root - -
meta/recipes-extended/pam/libpam_1.5.1.bb +19 -2
@@ -24,6 +24,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ file://0001-Makefile.am-support-usrmage.patch \ file://run-ptest \ + file://pam-volatiles.conf \ " SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc"
@@ -125,8 +126,18 @@ do_install() { # don't install /var/run when populating rootfs. Do it through volatile rm -rf ${D}${localstatedir} - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + rm -rf ${D}${sysconfdir}/rc* + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/pam-volatiles.conf \ + ${D}${sysconfdir}/tmpfiles.d/pam.conf + else + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_pam \ + ${D}${sysconfdir}/default/volatiles/ + fi install -d ${D}${sysconfdir}/pam.d/ install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
@@ -146,6 +157,12 @@ do_install_ptest() { fi } +pkg_postinst_${PN}() { + if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + /etc/init.d/populate-volatile.sh update + fi +} + inherit features_check REQUIRED_DISTRO_FEATURES = "pam"
Signature · 1 line
2.17.1