diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-12-18 16:20:07 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 17:06:58 +0000 |
| commit | dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8 (patch) | |
| tree | 8fc60245c3319440deb70b46c7c72a4e247431ac /meta/recipes-core | |
| parent | d01da862d10d9544f8da846b577cf955041d4c0c (diff) | |
| download | openembedded-core-contrib-dfcd8f2a6f5847d735755c1644c4c93be4fbb3e8.tar.gz | |
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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_208.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index c1f8d773fb..372e73d8e0 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 () { |