When VOLATILE_LOG_DIR evaluates as True, the base-files recipe provides
/var/log -> /var/volatile/log symlink which is in conflict with systemd
upstream tmpfiles.d/var.conf.in which defines it as a directory.

This generates following error in journal:

  Jul 03 14:28:00 qemux86-64 systemd-tmpfiles[165]: "/var/log" already exists 
and is not a directory.

Mitigate the issue by defining /var/log as symlink corresponding to
the one created by base-files, when appropriate.

(From OE-Core rev: 711ee36e88c8968e3c45ea787b3adcf64352adf9)

Signed-off-by: Niko Mauno <niko.ma...@vaisala.com>
Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
 meta/recipes-core/systemd/systemd_255.4.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_255.4.bb 
b/meta/recipes-core/systemd/systemd_255.4.bb
index f58a1bc2b6..0ccca8a567 100644
--- a/meta/recipes-core/systemd/systemd_255.4.bb
+++ b/meta/recipes-core/systemd/systemd_255.4.bb
@@ -307,9 +307,10 @@ do_install() {
        fi
 
        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.
+               # base-files recipe provides /var/log which is a symlink to 
/var/volatile/log
                rm -rf ${D}${localstatedir}/log
+               printf 'L\t\t%s/log\t\t-\t-\t-\t-\t%s/volatile/log\n' 
"${localstatedir}" \
+                       "${localstatedir}" 
>>${D}${nonarch_libdir}/tmpfiles.d/00-create-volatile.conf
        elif [ -e ${D}${localstatedir}/log/journal ]; then
                chown root:systemd-journal ${D}${localstatedir}/log/journal
 
-- 
2.39.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203176): 
https://lists.openembedded.org/g/openembedded-core/message/203176
Mute This Topic: https://lists.openembedded.org/mt/107809461/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to