udev: fix multiple mounting of /dev, increment PR

PATCH In review Stanislav Brabec 1 participant 1 message Jul 15, 2010

lore

Share & tools

lore

Stanislav Brabec

author

2010-07-15 23:18 UTC #0 lore raw

PATCH 3/3 udev: fix multiple mounting of /dev, increment PR

Attached patch fixes multiple mounting of udev if udev init script is started more than once.

And finally, it increments PR where appropriate.

Well, and now, after installation of udev-compat141 my spitz boots again.

udev: Fix possible multiple mounting of /dev, increment PR.

recipes/udev/udev-124/init +1 -1

index efe4470..1009381 100644
@@ -29,7 +29,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\" { exit 1 }" /proc/mounts && {
         mount -n -o mode=0755 -t tmpfs none "/dev"
         mkdir -m 0755 /dev/pts
         mkdir -m 0755 /dev/shm

recipes/udev/udev-141/init +1 -1

index 66705e6..efd9c23 100644
@@ -29,7 +29,7 @@ export ACTION=add
 echo "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\" { exit 1 }" /proc/mounts && {
         mount -n -o mode=0755 -t tmpfs none "/dev"
         mkdir -m 0755 /dev/pts
         mkdir -m 1777 /dev/shm

recipes/udev/udev-151/init +1 -1

index f4dc5de..fea2ca6 100644
@@ -29,7 +29,7 @@ export ACTION=add
 echo "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\" { exit 1 }" /proc/mounts && {
         mount -n -o mode=0755 -t tmpfs none "/dev"
         mkdir -m 0755 /dev/pts
         mkdir -m 1777 /dev/shm

recipes/udev/udev-154/init +1 -1

index f4dc5de..fea2ca6 100644
@@ -29,7 +29,7 @@ export ACTION=add
 echo "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\" { exit 1 }" /proc/mounts && {
         mount -n -o mode=0755 -t tmpfs none "/dev"
         mkdir -m 0755 /dev/pts
         mkdir -m 1777 /dev/shm

recipes/udev/udev.inc +1 -1

index f4f1c40..2edc10b 100644
@@ -14,7 +14,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://init \
 	   file://udev-compat-wrapper-patch"
 
-INC_PR = "r27"
+INC_PR = "r28"
 
 inherit update-rc.d autotools pkgconfig

recipes/udev/udev_124.bb +1 -1

index 30b0499..d0d5420 100644
@@ -5,7 +5,7 @@ RPROVIDES_${PN} = "hotplug"
 
 require udev.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 LD = "${CC}"

recipes/udev/udev_141.bb +1 -1

index 3ef9f7d..798590c 100644
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 
 require udev.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://mount.blacklist \
 	    file://run.rules \

recipes/udev/udev_151.bb +1 -1

index ce97a7b..eb0d6a9 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r12"
+PR = "r13"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"

recipes/udev/udev_154.bb +1 -1

index 6032215..3cf6358 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r0"
+PR = "r1"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"

Signature · 3 lines

________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus