diff options
| author |   Randy Witt <randy.e.witt@linux.intel.com> | 2015-03-23 17:28:13 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-24 10:09:02 +0000 |
| commit | 6d68e64a1ecf7c2a4903b0dcdbe25aa6412ff231 (patch) | |
| tree | 209ccd12b367b07975ac8464d4162b26cc9c3bf0 /meta | |
| parent | 2e3768075878b8fc0f7642cae89ab7b9d03fe52c (diff) | |
| download | openembedded-core-contrib-6d68e64a1ecf7c2a4903b0dcdbe25aa6412ff231.tar.gz | |
Revert "systemd: Fix the problem of an empty journal on boot"
This reverts commit e75c95ceca34879698b1ea229a2101dc1ccc12fc. The fix
was reported to cause long waits for some users.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/journald-volatile.conf | 6 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_219.bb | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf deleted file mode 100644 index b11e1606b5..0000000000 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ /dev/null @@ -1,6 +0,0 @@ -# If /var/volatile is a mount point then make sure to mount it before -# the journal starts. This is because base-files creates a symlink -# /var/log -> /var/volatile/log. And if the journal starts before the mount -# happens, the journal will appear empty until restarted. -[Unit] -After=var-volatile.mount diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index f2d3c13e70..43c4f95e4b 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -51,7 +51,6 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \ file://00-create-volatile.conf \ file://init \ file://run-ptest \ - file://journald-volatile.conf \ " S = "${WORKDIR}/git" @@ -153,7 +152,6 @@ do_install() { install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d |