From 9de20344a049c623228cc76e564bb7852992698c Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Tue, 1 Sep 2009 17:20:30 +0200 Subject: udev: exclude mtd* from persistent storage rules Exclude mtd* devices from the persistent storage rules to avoid invalid vol_id invocations on MTD partitions that may not be accessible. Signed-off-by: Maxime Petazzoni --- recipes/udev/udev-092/mtd-exclude-persistent.patch | 17 +++++++++++++++++ recipes/udev/udev-100/mtd-exclude-persistent.patch | 17 +++++++++++++++++ recipes/udev/udev-118/mtd-exclude-persistent.patch | 13 +++++++++++++ recipes/udev/udev-124/mtd-exclude-persistent.patch | 13 +++++++++++++ recipes/udev/udev_092.bb | 3 ++- recipes/udev/udev_100.bb | 3 ++- recipes/udev/udev_118.bb | 3 ++- recipes/udev/udev_124.bb | 3 ++- 8 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 recipes/udev/udev-092/mtd-exclude-persistent.patch create mode 100644 recipes/udev/udev-100/mtd-exclude-persistent.patch create mode 100644 recipes/udev/udev-118/mtd-exclude-persistent.patch create mode 100644 recipes/udev/udev-124/mtd-exclude-persistent.patch (limited to 'recipes/udev') diff --git a/recipes/udev/udev-092/mtd-exclude-persistent.patch b/recipes/udev/udev-092/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..30032d402d --- /dev/null +++ b/recipes/udev/udev-092/mtd-exclude-persistent.patch @@ -0,0 +1,17 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- + etc/udev/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- udev-092.orig/etc/udev/60-persistent-storage.rules ++++ udev-092/etc/udev/60-persistent-storage.rules +@@ -5,7 +5,7 @@ ACTION!="add", GOTO="persistent_storage_ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*", GOTO="persistent_storage_end" + + # never access removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-100/mtd-exclude-persistent.patch b/recipes/udev/udev-100/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..2b848810d2 --- /dev/null +++ b/recipes/udev/udev-100/mtd-exclude-persistent.patch @@ -0,0 +1,17 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- + etc/udev/rules.d/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- udev-100.orig/etc/udev/rules.d/60-persistent-storage.rules ++++ udev-100/etc/udev/rules.d/60-persistent-storage.rules +@@ -5,7 +5,7 @@ ACTION!="add", GOTO="persistent_storage_ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|dm-*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|dm-*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-118/mtd-exclude-persistent.patch b/recipes/udev/udev-118/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..204b7b487d --- /dev/null +++ b/recipes/udev/udev-118/mtd-exclude-persistent.patch @@ -0,0 +1,13 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- a/etc/udev/rules.d/60-persistent-storage.rules 2008-06-12 07:24:30.000000000 +0200 ++++ b/etc/udev/rules.d/60-persistent-storage.rules 2009-08-18 11:39:23.595063264 +0200 +@@ -10,7 +10,7 @@ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-124/mtd-exclude-persistent.patch b/recipes/udev/udev-124/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..204b7b487d --- /dev/null +++ b/recipes/udev/udev-124/mtd-exclude-persistent.patch @@ -0,0 +1,13 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- a/etc/udev/rules.d/60-persistent-storage.rules 2008-06-12 07:24:30.000000000 +0200 ++++ b/etc/udev/rules.d/60-persistent-storage.rules 2009-08-18 11:39:23.595063264 +0200 +@@ -10,7 +10,7 @@ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev_092.bb b/recipes/udev/udev_092.bb index d9f5cbaa68..50d2156bcd 100644 --- a/recipes/udev/udev_092.bb +++ b/recipes/udev/udev_092.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 = "r24" +PR = "r25" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -11,6 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ file://arm_inotify_fix.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ " diff --git a/recipes/udev/udev_100.bb b/recipes/udev/udev_100.bb index ef08aa4636..550d047cf1 100644 --- a/recipes/udev/udev_100.bb +++ b/recipes/udev/udev_100.bb @@ -9,11 +9,12 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r15" +PR = "r16" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ file://mount.sh \ " diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb index b7043496af..631b8c2df3 100644 --- a/recipes/udev/udev_118.bb +++ b/recipes/udev/udev_118.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" DEFAULT_PREFERENCE = "-118" @@ -12,6 +12,7 @@ SRC_URI = "\ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ " TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb index 9477c55ab9..ab391a3394 100644 --- a/recipes/udev/udev_124.bb +++ b/recipes/udev/udev_124.bb @@ -2,7 +2,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r17" +PR = "r18" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ file://libvolume-id-soname.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ file://run.rules \ file://default \ -- cgit v1.2.3