summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-08-08 07:41:48 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-08-08 07:41:48 +0000
commit9c6564913444836841e9089a6b371cd5997c83b3 (patch)
tree528d56d86ca7f85adc7978b42de46a2636a5427b /meta
parent29346602b44a28a29e12afc4ec60ab91ed7f0a9c (diff)
downloadpoky-9c6564913444836841e9089a6b371cd5997c83b3.tar.gz
udev: improved mount.sh
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5025 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/udev/files/akita/mount.blacklist5
-rw-r--r--meta/packages/udev/files/c7x0/mount.blacklist5
-rw-r--r--meta/packages/udev/files/mount.sh4
-rw-r--r--meta/packages/udev/files/spitz/mount.blacklist5
-rw-r--r--meta/packages/udev/files/tosa/mount.blacklist5
-rw-r--r--meta/packages/udev/udev_124.bb2
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 @@
1# This is a grep pattern matched against the device name
2# Any matched pattern will _not_ be mounted / removed by udevd
3
4/dev/mtdblock 1/dev/mtdblock
5/dev/loop 2/dev/loop
6/dev/ram \ No newline at end of file 3/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 @@
1# This is a grep pattern matched against the device name
2# Any matched pattern will _not_ be mounted / removed by udevd
3
4/dev/mtdblock 1/dev/mtdblock
5/dev/loop 2/dev/loop
6/dev/ram \ No newline at end of file 3/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"
9PMOUNT="/usr/bin/pmount" 9PMOUNT="/usr/bin/pmount"
10UMOUNT="/bin/umount" 10UMOUNT="/bin/umount"
11 11
12for line in `grep -v ^# /etc/udev/mount.blacklist` 12for line in `cat /etc/udev/mount.blacklist`
13do 13do
14 if { echo "$DEVNAME" | grep -q "$line" ; } 14 if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
15 then 15 then
16 logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" 16 logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
17 exit 0 17 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 @@
1# This is a grep pattern matched against the device name
2# Any matched pattern will _not_ be mounted / removed by udevd
3
4/dev/mtdblock 1/dev/mtdblock
5/dev/hda 2/dev/hda
6/dev/loop 3/dev/loop
7/dev/ram \ No newline at end of file 4/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 @@
1# This is a grep pattern matched against the device name
2# Any matched pattern will _not_ be mounted / removed by udevd
3
4/dev/mtdblock 1/dev/mtdblock
5/dev/loop 2/dev/loop
6/dev/ram \ No newline at end of file 3/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
3the hotplug package and requires a kernel not older than 2.6.12." 3the hotplug package and requires a kernel not older than 2.6.12."
4RPROVIDES_${PN} = "hotplug" 4RPROVIDES_${PN} = "hotplug"
5 5
6PR = "r5" 6PR = "r6"
7 7
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
9 file://noasmlinkage.patch;patch=1 \ 9 file://noasmlinkage.patch;patch=1 \