| 1 |
commit: 11dda8627ed625c56cc93e920d4d31fa9204b9fb |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 15 20:20:35 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 20:39:49 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=11dda862 |
| 7 |
|
| 8 |
make our population calls match upstreams recommendations |
| 9 |
|
| 10 |
--- |
| 11 |
init.d/udev | 15 +++++---------- |
| 12 |
1 files changed, 5 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/init.d/udev b/init.d/udev |
| 15 |
index eef2776..671ad86 100644 |
| 16 |
--- a/init.d/udev |
| 17 |
+++ b/init.d/udev |
| 18 |
@@ -114,23 +114,18 @@ populate_dev() |
| 19 |
fi |
| 20 |
|
| 21 |
ebegin "Populating /dev with existing devices through uevents" |
| 22 |
- if yesno "${rc_coldplug}"; then |
| 23 |
- udevadm trigger --action="add" |
| 24 |
- else |
| 25 |
+ if ! yesno "${rc_coldplug}"; then |
| 26 |
# Do not run any init-scripts, Bug #206518 |
| 27 |
udevadm control --property=do_not_run_plug_service=1 |
| 28 |
- |
| 29 |
- # only create device nodes |
| 30 |
- udevadm trigger --action="add" --attr-match=dev |
| 31 |
- |
| 32 |
- # run persistent-net stuff, bug 191466 |
| 33 |
- udevadm trigger --action="add" --subsystem-match=net |
| 34 |
fi |
| 35 |
+ udevadm trigger --type=subsystems |
| 36 |
+ udevadm trigger --type=devices |
| 37 |
eend $? |
| 38 |
|
| 39 |
# we can speed up booting under these conditions: |
| 40 |
# * using devtmpfs so kernel creates device nodes for us |
| 41 |
- # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) |
| 42 |
+ # * only using kernel created device nodes at boot |
| 43 |
+ # (in /etc/fstab and elsewhere) |
| 44 |
# |
| 45 |
ebegin "Waiting for uevents to be processed" |
| 46 |
udevadm settle --timeout=${udev_settle_timeout} |
Archives