summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-20 14:01:21 +0000
committerSaul Wold <sgw@linux.intel.com>2012-01-02 20:26:25 -0800
commit08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c (patch)
tree66bb412b396a95694be0fab65e7c4dd245f3d953
parentd6b7ff13a64c6ff2aa8d1ee089733c9aada539a9 (diff)
downloadopenembedded-core-08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c.tar.gz
openembedded-core-08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c.tar.bz2
openembedded-core-08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c.tar.xz
openembedded-core-08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c.zip
udev: skip mounting /dev on tmpfs if it is on devtmpfs
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--meta/recipes-core/udev/udev/init2
-rw-r--r--meta/recipes-core/udev/udev_164.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index edc3c9a14..d0d7e5d0e 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -28,7 +28,7 @@ export ACTION=add
echo -n "Starting udev"
# mount the tmpfs on /dev, if not already done
-LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /proc/mounts && {
mount -n -o mode=0755 -t tmpfs none "/dev"
mkdir -m 0755 /dev/pts
mkdir -m 1777 /dev/shm
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 3e4e40274..f952c907c 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r7"
+PR = "r8"
SRC_URI += "file://udev-166-v4l1-1.patch"