summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd/var-run.conf4
-rw-r--r--meta/recipes-core/systemd/systemd_204.bb3
2 files changed, 0 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd/var-run.conf b/meta/recipes-core/systemd/systemd/var-run.conf
deleted file mode 100644
index c2c18e2b99..0000000000
--- a/meta/recipes-core/systemd/systemd/var-run.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1# empty /var/run
2R /var/run/* - - - - -
3# systemd-update-utmp-runlevel.service fails to start without this
4f /var/run/utmp 0644 root root - -
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb
index ec5be1f804..9664e0428c 100644
--- a/meta/recipes-core/systemd/systemd_204.bb
+++ b/meta/recipes-core/systemd/systemd_204.bb
@@ -20,7 +20,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern
20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ 20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
21 file://touchscreen.rules \ 21 file://touchscreen.rules \
22 file://modprobe.rules \ 22 file://modprobe.rules \
23 file://var-run.conf \
24 ${UCLIBCPATCHES} \ 23 ${UCLIBCPATCHES} \
25 file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \ 24 file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
26 file://00-create-volatile.conf \ 25 file://00-create-volatile.conf \
@@ -105,8 +104,6 @@ do_install() {
105 104
106 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ 105 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
107 106
108 install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
109
110 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ 107 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
111 108
112 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 109 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then