summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-03-23 17:28:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:40 +0000
commit443938795e506bdc217ced44677032a8eeaa12fe (patch)
tree259f021d2fc05d9033025a67d94dd2847a7b9d83 /meta/recipes-core/systemd
parent68bc42113de55bc1724c13c7a4646a75d2cab7be (diff)
downloadpoky-443938795e506bdc217ced44677032a8eeaa12fe.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. (From OE-Core rev: 6d68e64a1ecf7c2a4903b0dcdbe25aa6412ff231) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/journald-volatile.conf6
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb2
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 @@
1# If /var/volatile is a mount point then make sure to mount it before
2# the journal starts. This is because base-files creates a symlink
3# /var/log -> /var/volatile/log. And if the journal starts before the mount
4# happens, the journal will appear empty until restarted.
5[Unit]
6After=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 \
51 file://00-create-volatile.conf \ 51 file://00-create-volatile.conf \
52 file://init \ 52 file://init \
53 file://run-ptest \ 53 file://run-ptest \
54 file://journald-volatile.conf \
55 " 54 "
56 55
57S = "${WORKDIR}/git" 56S = "${WORKDIR}/git"
@@ -153,7 +152,6 @@ do_install() {
153 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ 152 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
154 153
155 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ 154 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
156 install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf
157 155
158 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 156 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
159 install -d ${D}${sysconfdir}/init.d 157 install -d ${D}${sysconfdir}/init.d