[oe-commits] Ross Burton : systemd: delete files that end up in /var/volatile
git at git.openembedded.org
git at git.openembedded.org
Wed Dec 18 17:05:59 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8
Author: Ross Burton <ross.burton at intel.com>
Date: Wed Dec 18 16:20:07 2013 +0000
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.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/systemd/systemd_208.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index c1f8d77..372e73d 100644
--- 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 () {
More information about the Openembedded-commits
mailing list