udev: improved mount.sh

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5025 311d38ba-8fff-0310-9ca6-ca027cbcb966

6 files changed, 7 insertions, 19 deletions

diff --git a/meta/packages/udev/files/akita/mount.blacklist b/meta/packages/udev/files/akita/mount.blacklist
index 7e351bc988..c15b582298 100644
--- a/meta/packages/udev/files/akita/mount.blacklist
+++ b/meta/packages/udev/files/akita/mount.blacklist
@@ -1,6 +1,3 @@
-# This is a grep pattern matched against the device name
-# Any matched pattern will _not_ be mounted / removed by udevd
-
 /dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
diff --git a/meta/packages/udev/files/c7x0/mount.blacklist b/meta/packages/udev/files/c7x0/mount.blacklist
index 7e351bc988..c15b582298 100644
--- a/meta/packages/udev/files/c7x0/mount.blacklist
+++ b/meta/packages/udev/files/c7x0/mount.blacklist
@@ -1,6 +1,3 @@
-# This is a grep pattern matched against the device name
-# Any matched pattern will _not_ be mounted / removed by udevd
-
 /dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
diff --git a/meta/packages/udev/files/mount.sh b/meta/packages/udev/files/mount.sh
index 0ce1dc7217..53fefa3681 100644
--- a/meta/packages/udev/files/mount.sh
+++ b/meta/packages/udev/files/mount.sh
@@ -9,9 +9,9 @@ MOUNT="/bin/mount"
 PMOUNT="/usr/bin/pmount"
 UMOUNT="/bin/umount"
 
-for line in `grep -v ^# /etc/udev/mount.blacklist`
+for line in `cat /etc/udev/mount.blacklist`
 do
-        if { echo "$DEVNAME" | grep -q "$line" ; }
+        if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
         then
                 logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
                 exit 0
diff --git a/meta/packages/udev/files/spitz/mount.blacklist b/meta/packages/udev/files/spitz/mount.blacklist
index 38c7aa4b32..aee308f9b8 100644
--- a/meta/packages/udev/files/spitz/mount.blacklist
+++ b/meta/packages/udev/files/spitz/mount.blacklist
@@ -1,7 +1,4 @@
-# This is a grep pattern matched against the device name
-# Any matched pattern will _not_ be mounted / removed by udevd
-
 /dev/mtdblock
 /dev/hda
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
diff --git a/meta/packages/udev/files/tosa/mount.blacklist b/meta/packages/udev/files/tosa/mount.blacklist
index 7e351bc988..c15b582298 100644
--- a/meta/packages/udev/files/tosa/mount.blacklist
+++ b/meta/packages/udev/files/tosa/mount.blacklist
@@ -1,6 +1,3 @@
-# This is a grep pattern matched against the device name
-# Any matched pattern will _not_ be mounted / removed by udevd
-
 /dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
diff --git a/meta/packages/udev/udev_124.bb b/meta/packages/udev/udev_124.bb
index e0f694565c..db8de02efd 100644
--- a/meta/packages/udev/udev_124.bb
+++ b/meta/packages/udev/udev_124.bb
@@ -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."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://noasmlinkage.patch;patch=1 \