summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-29 15:16:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-30 11:06:38 +0000
commit4801ed79151c9640f5f07d03d47db334e1a90161 (patch)
treeb3f10d0539b77a0c57b6d03451755bfe8f0e794e /meta
parent656979f20627d9408523cb51b94f5a15067b268c (diff)
downloadpoky-4801ed79151c9640f5f07d03d47db334e1a90161.tar.gz
udev: Ensure tmpfs are mounted and volatile/run exists
There is a race with udev where eiher the run directory can get replaced during bootup leading to ude errors, or if the tmpfs was mounted and populate-volatiles hasn't run, udev won't start at all. This ensures that any tmpfs get mounted before udev starts and that the default volatiles/run directory at least exists, fixing the races and boot time errors caused after the recent udev upgrade. (From OE-Core rev: fbec192f6bc41a335ede85843ba22a89d13501ab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/udev/udev/init5
-rw-r--r--meta/recipes-core/udev/udev_182.bb2
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index ca02abb6f1..74449feaaa 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -37,9 +37,8 @@ export ACTION=add
37echo "Starting udev" 37echo "Starting udev"
38 38
39# mount the tmpfs on /dev, if not already done 39# mount the tmpfs on /dev, if not already done
40LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /proc/mounts && { 40mount -a -t tmpfs
41 mount -n -o mode=0755 -t tmpfs none "/dev" 41mkdir -p /var/volatile/run
42}
43[ -e /dev/pts ] || mkdir -m 0755 /dev/pts 42[ -e /dev/pts ] || mkdir -m 0755 /dev/pts
44[ -e /dev/shm ] || mkdir -m 1777 /dev/shm 43[ -e /dev/shm ] || mkdir -m 1777 /dev/shm
45 44
diff --git a/meta/recipes-core/udev/udev_182.bb b/meta/recipes-core/udev/udev_182.bb
index 8e4a391286..c41de9fef4 100644
--- a/meta/recipes-core/udev/udev_182.bb
+++ b/meta/recipes-core/udev/udev_182.bb
@@ -1,6 +1,6 @@
1include udev.inc 1include udev.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5# module-init-tools from kmod_git will provide libkmod runtime 5# module-init-tools from kmod_git will provide libkmod runtime
6DEPENDS += "module-init-tools" 6DEPENDS += "module-init-tools"