[CONSOLIDATED,PULL,10/28] udev-164: Update init script to do an explicit add action

Submitted by Saul Wold on Nov. 5, 2011, 5:22 p.m.

Details

Message ID d18b1fbf8174d4b865b650d905b9de1c87a851c8.1320513631.git.sgw@linux.intel.com
State New
Headers show

Commit Message

Saul Wold Nov. 5, 2011, 5:22 p.m.
From: Kumar Gala <galak@kernel.crashing.org>

With udev 152 or greater the default action for 'udevadm trigger' was
modified to be 'change' instead of 'add.

To ensure initial coldplug events at boot are seen be scripts the are
expecting them as 'add' events we invoke udevadm with an explicit
'--action=add'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/recipes-core/udev/udev-164/init |    4 ++--
 meta/recipes-core/udev/udev_164.bb   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/udev/udev-164/init b/meta/recipes-core/udev/udev-164/init
index 9ce95ee..073942f 100644
--- a/meta/recipes-core/udev/udev-164/init
+++ b/meta/recipes-core/udev/udev-164/init
@@ -48,10 +48,10 @@  kill_udevd > "/dev/null" 2>&1
 
         /sbin/udevadm control --env=STARTUP=1
 		if [ "$not_first_boot" != "" ];then
-			/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
+			/sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
 			(/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)&
 		else
-			/sbin/udevadm trigger
+			/sbin/udevadm trigger --action=add
 			/sbin/udevadm settle
 		fi
 
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 7cbe4d8..d487add 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@ 
 include udev-new.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://udev-166-v4l1-1.patch"