summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-04-13 17:46:05 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-13 17:46:05 +0000
commit9073ce613da8af14328530042125284336df151a (patch)
tree2116898becfdd3034d3ed5bd427b5b0687a8844f /packages
parentae37f74013fca27d3f784b4b2555db57433e0c6f (diff)
udev: Add changes from .oz354x
Diffstat (limited to 'packages')
-rw-r--r--packages/udev/files/akita/.mtn2git_empty0
-rw-r--r--packages/udev/files/akita/mount.blacklist4
-rw-r--r--packages/udev/files/c7x0/.mtn2git_empty0
-rw-r--r--packages/udev/files/c7x0/mount.blacklist4
-rw-r--r--packages/udev/files/mount.blacklist0
-rw-r--r--packages/udev/files/mount.sh10
-rw-r--r--packages/udev/files/spitz/.mtn2git_empty0
-rw-r--r--packages/udev/files/spitz/mount.blacklist5
-rw-r--r--packages/udev/files/tosa/.mtn2git_empty0
-rw-r--r--packages/udev/files/tosa/mount.blacklist4
-rw-r--r--packages/udev/udev_084.bb8
-rw-r--r--packages/udev/udev_089.bb6
12 files changed, 37 insertions, 4 deletions
diff --git a/packages/udev/files/akita/.mtn2git_empty b/packages/udev/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/akita/.mtn2git_empty
diff --git a/packages/udev/files/akita/mount.blacklist b/packages/udev/files/akita/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/akita/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/files/c7x0/.mtn2git_empty b/packages/udev/files/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/c7x0/.mtn2git_empty
diff --git a/packages/udev/files/c7x0/mount.blacklist b/packages/udev/files/c7x0/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/c7x0/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/files/mount.blacklist b/packages/udev/files/mount.blacklist
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/mount.blacklist
diff --git a/packages/udev/files/mount.sh b/packages/udev/files/mount.sh
index 7e641b08d7..010b7289f2 100644
--- a/packages/udev/files/mount.sh
+++ b/packages/udev/files/mount.sh
@@ -9,6 +9,16 @@ MOUNT="/bin/mount"
PMOUNT="/usr/bin/pmount"
UMOUNT="/bin/umount"
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+ if ( echo "$DEVNAME" | grep -q "$line" )
+ then
+ logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+ exit 0
+ fi
+done
+
+
if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
if [ -x "$PMOUNT" ]; then
$PMOUNT $DEVNAME 2> /dev/null
diff --git a/packages/udev/files/spitz/.mtn2git_empty b/packages/udev/files/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/spitz/.mtn2git_empty
diff --git a/packages/udev/files/spitz/mount.blacklist b/packages/udev/files/spitz/mount.blacklist
new file mode 100644
index 0000000000..1dad9117da
--- /dev/null
+++ b/packages/udev/files/spitz/mount.blacklist
@@ -0,0 +1,5 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/hda
diff --git a/packages/udev/files/tosa/.mtn2git_empty b/packages/udev/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/tosa/.mtn2git_empty
diff --git a/packages/udev/files/tosa/mount.blacklist b/packages/udev/files/tosa/mount.blacklist
new file mode 100644
index 0000000000..c2684b7c28
--- /dev/null
+++ b/packages/udev/files/tosa/mount.blacklist
@@ -0,0 +1,4 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb
index fc8a701684..30baa9e2fe 100644
--- a/packages/udev/udev_084.bb
+++ b/packages/udev/udev_084.bb
@@ -7,13 +7,14 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
file://flags.patch;patch=1 \
file://udevsynthesize.patch;patch=1 \
- file://udevsynthesize.sh"
-
+ file://udevsynthesize.sh \
+ file://mount.blacklist"
+
include udev.inc
INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
-PR = "r4"
+PR = "r5"
FILES_${PN} += "${base_libdir}"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
@@ -28,6 +29,7 @@ do_install () {
install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb
index 28cda40f0f..ba1e5b4161 100644
--- a/packages/udev/udev_089.bb
+++ b/packages/udev/udev_089.bb
@@ -5,11 +5,14 @@ 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 = "hotplug"
+PR = "r1"
+
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
file://flags.patch;patch=1 \
file://udevsynthesize.patch;patch=1 \
- file://udevsynthesize.sh"
+ file://udevsynthesize.sh \
+ file://mount.blacklist"
include udev.inc
@@ -28,6 +31,7 @@ do_install () {
install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules