diff options
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 @@ | |||
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] | ||
6 | 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 \ | |||
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 | ||
57 | S = "${WORKDIR}/git" | 56 | S = "${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 |