systemd: Do not install anything in /var/volatile

/var/log is typically a symbolic link to inside /var/volatile, which
is expected to be empty. Check ${VOLATILE_LOG_DIR} to see if it is ok
to install /var/log.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/systemd/systemd_249.5.bb b/meta/recipes-core/systemd/systemd_249.5.bb
index d87f54bf162cc40934f457b150c70d9c3d397533..c0c1f9bcfc2ddfe400e180a73cc5e888637827d6 100644 (file)
--- a/meta/recipes-core/systemd/systemd_249.5.bb
+++ b/meta/recipes-core/systemd/systemd_249.5.bb
@@ -270,13 +270,16 @@ do_install() {
                install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_system_unitdir}d-sysv-install
        fi
 
-       chown root:systemd-journal ${D}/${localstatedir}/log/journal
-
-       # Delete journal README, as log can be symlinked inside volatile.
-       rm -f ${D}/${localstatedir}/log/README
+       if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then
+               # /var/log is typically a symbolic link to inside /var/volatile,
+               # which is expected to be empty.
+               rm -rf ${D}${localstatedir}/log
+       else
+               chown root:systemd-journal ${D}${localstatedir}/log/journal
 
-       # journal-remote creates this at start
-       rm -rf ${D}/${localstatedir}/log/journal/remote
+               # journal-remote creates this at start
+               rm -rf ${D}${localstatedir}/log/journal/remote
+       fi
 
        install -d ${D}${systemd_system_unitdir}/graphical.target.wants
        install -d ${D}${systemd_system_unitdir}/multi-user.target.wants