summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-26 21:13:04 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-29 22:07:23 +0100
commit0c357b53b2c0123feeedfc202491b39eb639bfa7 (patch)
treecb0856dc225f216615e92aeb50bedb97df0dd255 /meta
parentee8e5b3ddaae1d3ae473a3cea2ff60fcee5877a2 (diff)
downloadopenembedded-core-0c357b53b2c0123feeedfc202491b39eb639bfa7.tar.gz
openembedded-core-0c357b53b2c0123feeedfc202491b39eb639bfa7.tar.bz2
openembedded-core-0c357b53b2c0123feeedfc202491b39eb639bfa7.zip
systemd: remove old /var/run workarounds
Do not clear /var/run on startup as it is a tmpfs. Do not create empty /var/run/utmp on startup as it no longer seems needed for systemd-update-utmp-runlevel.service to start properly. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-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 @@
-# empty /var/run
-R /var/run/* - - - - -
-# systemd-update-utmp-runlevel.service fails to start without this
-f /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
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://touchscreen.rules \
file://modprobe.rules \
- file://var-run.conf \
${UCLIBCPATCHES} \
file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
file://00-create-volatile.conf \
@@ -105,8 +104,6 @@ do_install() {
install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
- install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
-
install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then