aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Kadzban <bryan@linuxfromscratch.org>2010-04-21 04:22:02 +0000
committerBryan Kadzban <bryan@linuxfromscratch.org>2010-04-21 04:22:02 +0000
commitd3eda3d73442dba7d33f5f307f7624eaebf283f1 (patch)
treed88ea402cd520dbe143ee4b643e2d196df263842
parent820c718c47f1fb6bff2e5366a045d4195e66b7e8 (diff)
Use --action=add on udevtrigger calls, to handle udev-152 and newer that send "change" events by default.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9256 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--bootscripts/ChangeLog5
-rw-r--r--bootscripts/lfs/init.d/udev2
-rw-r--r--bootscripts/lfs/init.d/udev_retry2
3 files changed, 7 insertions, 2 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 2a2a334e5..aaff70c15 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-20 Bryan Kadzban <bryan@linuxfromscratch.org>
+ * lfs/init.d/udev, lfs/init.d/udev_retry: Add --action=add, to handle udev
+ version 152 and newer, which send "change" events by default in udevtrigger
+ now.
+
2010-01-24 Matthew Burgess <matthew@linuxfromscratch.org>
* lfs/init.d/udev: Check to see if /dev is already mounted, as it may be if
under an initramfs environment. See ticket #2550.
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 18965d514..ff4fe2a7a 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -62,7 +62,7 @@ case "${1}" in
# Now traverse /sys in order to "coldplug" devices that have
# already been discovered
- /sbin/udevadm trigger
+ /sbin/udevadm trigger --action=add
# Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle
diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry
index 6a049d465..e44b8afa0 100644
--- a/bootscripts/lfs/init.d/udev_retry
+++ b/bootscripts/lfs/init.d/udev_retry
@@ -29,7 +29,7 @@ case "${1}" in
done
# Re-trigger the failed uevents in hope they will succeed now
- /sbin/udevadm trigger --type=failed
+ /sbin/udevadm trigger --type=failed --action=add
# Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle