Patchwork [5/9] udev: skip mounting /dev on tmpfs if it is on devtmpfs

login
register
mail settings
Submitter Otavio Salvador
Date Dec. 20, 2011, 7:04 p.m.
Message ID <90fd35195c25adfe591493ef5863f0b0014d944e.1324407759.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/17329/
State New
Headers show

Comments

Otavio Salvador - Dec. 20, 2011, 7:04 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-core/udev/udev/init   |    2 +-
 meta/recipes-core/udev/udev_164.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Otavio Salvador - Dec. 20, 2011, 9:27 p.m.
A fixed patch for this one is going to be send.

On Tue, Dec 20, 2011 at 17:04, Otavio Salvador <otavio@ossystems.com.br>wrote:

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta/recipes-core/udev/udev/init   |    2 +-
>  meta/recipes-core/udev/udev_164.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/udev/udev/init
> b/meta/recipes-core/udev/udev/init
> index edc3c9a..0b25b07 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 3e4e402..f952c90 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"
>
> --
> 1.7.2.5
>
>

Patch

diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index edc3c9a..0b25b07 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 3e4e402..f952c90 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"