From 3c488a49b512afd25c4b696e7b688af516dc6513 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 21 Jul 2012 08:05:07 +0000 Subject: systemd: cleanup /var/run on boot and create /var/run/utmp * Angstrom uses /var/run cleanup because: Some apps (e.g. avahi-daemon) to clean up their old-style pid files and fail to start every other boot. Se we let systemd clean it on boot. Which seems general enough, so lets move var-run.conf from base-files.bbappend to systemd recipe. * /var/run/utmp was created by volatiles before, but without sysvinit installed systemd-update-utmp-runlevel.service fails to start without this file Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- meta-systemd/recipes-core/systemd/systemd/var-run.conf | 4 ++++ meta-systemd/recipes-core/systemd/systemd_git.bb | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta-systemd/recipes-core/systemd/systemd/var-run.conf (limited to 'meta-systemd') diff --git a/meta-systemd/recipes-core/systemd/systemd/var-run.conf b/meta-systemd/recipes-core/systemd/systemd/var-run.conf new file mode 100644 index 0000000000..c2c18e2b99 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd/var-run.conf @@ -0,0 +1,4 @@ +# 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-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb index 9cbdd76c13..386843845c 100644 --- a/meta-systemd/recipes-core/systemd/systemd_git.bb +++ b/meta-systemd/recipes-core/systemd/systemd_git.bb @@ -19,7 +19,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r2" +PR = "r3" inherit useradd pkgconfig autotools vala perlnative @@ -29,6 +29,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ file://gtk-doc.make \ file://touchscreen.rules \ file://modprobe.rules \ + file://var-run.conf \ " LDFLAGS_libc-uclibc_append = " -lrt" @@ -82,6 +83,8 @@ do_install() { touch ${D}${sysconfdir}/machine-id install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ } python populate_packages_prepend (){ -- cgit 1.2.3-korg