From f76d4b3549ca220fa4bf84db2756ab45e11d06a3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 26 Mar 2013 16:18:28 +0000 Subject: udev: move /run volatile entry to udev instead of initscripts initscripts is generally installed on systemd-using images, but because it specifies that /run is a symlink to /var/run managed by volatiles it totally breaks systemd by copying/deleting /run from underneath systemd. Deleting sockets mid-boot doesn't leave systemd in a happy place. As this volatile reference of /run was introduced by udev 182, move it's reference to the udev recipe. This way it will never be present on systemd images, as systemd manages /run as a tmpfs itself. (From OE-Core rev: 5b0257e318340c2d6c8d3b0c3fa32272d6e9526b) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/udev/udev.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/udev/udev.inc') diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc index bd82c34b57..e358d2d200 100644 --- a/meta/recipes-core/udev/udev.inc +++ b/meta/recipes-core/udev/udev.inc @@ -27,7 +27,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://local.rules \ file://udev-cache \ file://udev-cache.default \ - file://init" + file://init \ + file://volatiles" inherit autotools pkgconfig update-rc.d @@ -81,6 +82,9 @@ do_install_append () { install -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_udev + touch ${D}${sysconfdir}/udev/cache.data install -d ${D}${sysconfdir}/udev/rules.d/ -- cgit 1.2.3-korg