From 526ca27a3cc9eed54b3b90083fe25de41a63e385 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 26 May 2013 21:13:04 +1000 Subject: 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. (From OE-Core rev: 0c357b53b2c0123feeedfc202491b39eb639bfa7) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd/var-run.conf | 4 ---- meta/recipes-core/systemd/systemd_204.bb | 3 --- 2 files changed, 7 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/var-run.conf (limited to 'meta/recipes-core/systemd') 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 -- cgit v1.2.3-54-g00ecf