systemd: delete files that end up in /var/volatile

${localstatedir}/log/journal is created by tmpfiles.d on boot, and the README
just causes warnings that /var/volatile isn't empty when mounting on top of it.

(From OE-Core rev: dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index c1f8d77..372e73d 100644 (file)
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -97,9 +97,6 @@ do_install() {
        ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
        ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
 
-       # Create dir for journal
-       install -d ${D}${localstatedir}/log/journal
-
        # Create machine-id
        # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
        touch ${D}${sysconfdir}/machine-id
@@ -113,6 +110,9 @@ do_install() {
                install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
                sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
        fi
+
+        # Delete journal README, as log can be symlinked inside volatile.
+        rm -f ${D}/${localstatedir}/log/README
 }
 
 do_install_ptest () {