summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-26 16:18:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:05 +0000
commitf76d4b3549ca220fa4bf84db2756ab45e11d06a3 (patch)
tree90489d75678103051eeb2afa84d527d33334a123 /meta
parentce10e5f34aa870136feba526071f3c2989641599 (diff)
downloadpoky-f76d4b3549ca220fa4bf84db2756ab45e11d06a3.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/volatiles1
-rw-r--r--meta/recipes-core/udev/udev.inc6
-rw-r--r--meta/recipes-core/udev/udev/volatiles1
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index f0c796c406..270f128a12 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -35,4 +35,3 @@ f root root 0664 /var/log/wtmp none
35f root root 0664 /var/run/utmp none 35f root root 0664 /var/run/utmp none
36l root root 0644 /etc/resolv.conf /var/run/resolv.conf 36l root root 0644 /etc/resolv.conf /var/run/resolv.conf
37f root root 0644 /var/run/resolv.conf none 37f root root 0644 /var/run/resolv.conf none
38l root root 0755 /run /var/run
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 \
27 file://local.rules \ 27 file://local.rules \
28 file://udev-cache \ 28 file://udev-cache \
29 file://udev-cache.default \ 29 file://udev-cache.default \
30 file://init" 30 file://init \
31 file://volatiles"
31 32
32inherit autotools pkgconfig update-rc.d 33inherit autotools pkgconfig update-rc.d
33 34
@@ -81,6 +82,9 @@ do_install_append () {
81 install -d ${D}${sysconfdir}/default 82 install -d ${D}${sysconfdir}/default
82 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache 83 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
83 84
85 install -d ${D}${sysconfdir}/default/volatiles
86 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_udev
87
84 touch ${D}${sysconfdir}/udev/cache.data 88 touch ${D}${sysconfdir}/udev/cache.data
85 89
86 install -d ${D}${sysconfdir}/udev/rules.d/ 90 install -d ${D}${sysconfdir}/udev/rules.d/
diff --git a/meta/recipes-core/udev/udev/volatiles b/meta/recipes-core/udev/udev/volatiles
new file mode 100644
index 0000000000..e33561bf06
--- /dev/null
+++ b/meta/recipes-core/udev/udev/volatiles
@@ -0,0 +1 @@
l root root 0755 /run /var/run