diff options
Diffstat (limited to 'sys-fs/udev')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/udev/Manifest | 12 | ||||
| -rw-r--r-- | sys-fs/udev/files/136/udev.confd | 21 | ||||
| -rw-r--r-- | sys-fs/udev/files/136/udev.initd | 30 |
4 files changed, 62 insertions, 8 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 44fc08b25ced..adb8f59a6337 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.439 2009/01/22 11:18:06 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.440 2009/01/22 11:41:37 zzam Exp $ + + 22 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> files/136/udev.confd, + files/136/udev.initd: + Add expert options to change udevsettle timeout and to run udevmonitor at + boot time to catch all events. 22 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild: Also set HOMEPAGE after inherit, Bug #255953. diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 42d505ec72f1..cea2293283a0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -8,8 +8,8 @@ AUX 136/udev-mount.initd 2523 RMD160 1b98e1bf8bead67ff6ce2a0077324755c43b6a60 SH AUX 136/udev-postmount.initd 505 RMD160 42a08fa97d7a8672249647e82369eb81abd88f1f SHA1 2ea973b6c6aea0b17a57586e55eac94f09dd9e1e SHA256 bae9074358b36706a69cbc9006d53f19a257613f6de00431273ebdbb234e038f AUX 136/udev-start.sh 1345 RMD160 c1b4aac1a52da1eac79f3b6a2ccb6e7036a81fdf SHA1 a8d889f3a1ed216d64affa79a99446611899b16d SHA256 5a56cb63ab5fec4f5393eca944d734bab1373bc2a75dcee6b202f86570541414 AUX 136/udev-stop.sh 237 RMD160 dea1f6d7525e792484c3d2c31d36e8b4d78ebda8 SHA1 72174a2e5e6be2133b2e5f68e477d0fa342b46ce SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d -AUX 136/udev.confd 1060 RMD160 541c9530a0ef5415b6aba6df24c49c82927fd972 SHA1 942f40b4760d6941e83003546ae8da4eb0912ec2 SHA256 01900956829beb4d031e097a8cca26e52ac33e0cb1658d1e8ab8eb7dbbd70bc6 -AUX 136/udev.initd 4707 RMD160 edf8d7523a1bb13c2356345696f625b9bf7444ed SHA1 4b14dbb90e5773239f61bad649b091577b7f3879 SHA256 4d57f119a5b7ef91d0991f03e77bee121c8464e538b2a8b1f98ed0a7d6e37d22 +AUX 136/udev.confd 1511 RMD160 275c4bcbd862d8f3573e60e059073b2c61627d98 SHA1 40f07d0677d47e9428aec2b5df40d84a6a40e41b SHA256 d69689ca647b0f65d3e269ca5d00678b0e6390139b773c9e46aa680a630c3897 +AUX 136/udev.initd 5558 RMD160 08772843bc2a2fb7e118593a1a3aa893b9de0efe SHA1 7d32f7719696cc96e72ce32f07c4e849e49c2373 SHA256 f63ba8c43fed7545270a426ae6cd333f77f7dac864ea44cddfc3fa129a64901b AUX blacklist-110 854 RMD160 6cb0acd91dad5c86c47b41f06f74a8529de08b8e SHA1 aa2c3c8340517053151ee687d76d4de05e28ac51 SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd AUX modprobe-114.sh 2106 RMD160 7b40f1d0c7e41aa51100c99d1b4accafe9309f00 SHA1 d8d3a6b047a416bf4a80a9dde6eddbcc1e7abb1b SHA256 acfff1be773352f71b7e68ec12aafa113150f76ecb1daa03088842d449df9d6b AUX modprobe-115.sh 2280 RMD160 effe6766adfff5733d396dbffe00827e61280c5b SHA1 dd9331410db47ce8cfb5ab2d9af8d420905313d6 SHA256 22ab8b9f68bfe6d0acb8d2aec70870700ca03ab80341734cbd059c680473739f @@ -83,12 +83,12 @@ EBUILD udev-135-r3.ebuild 11230 RMD160 b1bfe5d74055ee6161a8881b38515e535e56519f EBUILD udev-135.ebuild 12079 RMD160 88554ff3379d6d74c0537a0848b71e346e5a6108 SHA1 1d2375e4eb0516e4015b534ac4ecb848e8ed5df9 SHA256 8cd73c178e60d06862bbe99f02e86cf0d517edcad6faa5dd0ffe57863355bdb9 EBUILD udev-136.ebuild 12044 RMD160 6f33dfc2134dd18a46bacf230aa33f7338d1b005 SHA1 bbdeb3f9c0085e35c4c65b1684287bc2356a4ea0 SHA256 892d2e556fa800beab9aa3b151f476067149d339ac769acdcd88e1f07de0134a EBUILD udev-9999.ebuild 11916 RMD160 428a7df9b6dd39f857e9eb917966372f189e3d6e SHA1 da995c94fa556c76b0e31a6c0721cb9b526d3aba SHA256 afa1d232d2690afb86db6c5d62736af711a79b967a7370c09619c7fb89819bac -MISC ChangeLog 90679 RMD160 ce2265963efc7194767b6745c7fcc3ca1f8c97cb SHA1 9defeb3968db5a4f333ae3a8b89e29c87d65c9d0 SHA256 8e5848c78c4c63b1b3941d2236e498e7eacc72d375e6536da0120f1c5aef1756 +MISC ChangeLog 90888 RMD160 ed91c23b0a64f46ac21c706a4d599169013f8eb1 SHA1 44b5e439a4b1a43ce4a749dc3cdcf9f6bb65d050 SHA256 b9a01d11edb7df0dbe6eb92b8ef8bd2fe8f277fc48f8e0bfbad07b31148fce7d MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkl4VfUACgkQt2vP6XvVdOePKwCgope9GH+kbSLdamQP0J+7Txs6 -kbEAn0csLymrCvPuJ9B8hT4DIb4oMwtU -=P1/A +iEYEARECAAYFAkl4W3YACgkQt2vP6XvVdOeCXACfSagv/sSN65JfR9V56NPp1MdH +yUAAoINRsjJEST4dltzHlomJ6WqJNism +=DkQx -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/136/udev.confd b/sys-fs/udev/files/136/udev.confd index 4abfa911674d..605078b4056a 100644 --- a/sys-fs/udev/files/136/udev.confd +++ b/sys-fs/udev/files/136/udev.confd @@ -25,3 +25,24 @@ persistent_net_disable="no" # in /etc/rc.conf: rc_hotplug="!*" or # in /etc/conf.d/rc: rc_plug_services="!*" #rc_coldplug="YES" + + + + +# Expert options: + +# Timeout in seconds to wait for processing of uevents at boot. +# There should be no need to change this. +#udev_settle_timeout="60" + +# Run udevadmin monitor to get a log of all events +# in /dev/.udev/udevmonitor.log +#udev_monitor="YES" + +# Keep udevmonitor running after populating /dev. +#udev_monitor_keep_running="no" + +# Set cmdline options for udevmonitor. +# could be some of --env --kernel --udev +#udev_monitor_opts="--env" + diff --git a/sys-fs/udev/files/136/udev.initd b/sys-fs/udev/files/136/udev.initd index 1707ccea7737..a9c98fb5cbb3 100644 --- a/sys-fs/udev/files/136/udev.initd +++ b/sys-fs/udev/files/136/udev.initd @@ -90,13 +90,39 @@ populate_dev() eend $? ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=60 + udevadm settle --timeout=${udev_settle_timeout:-60} eend $? udevadm control --env do_not_run_plug_service= return 0 } +# for debugging +start_udevmonitor() +{ + yesno "${udev_monitor:-no}" || return 0 + + udevmonitor_log=/dev/.udev/udevmonitor.log + udevmonitor_pid=/dev/.udev/udevmonitor.pid + + einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" + start-stop-daemon --start --stdout "${udevmonitor_log}" \ + --make-pidfile --pidfile "${udevmonitor_pid}" \ + --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} +} + +stop_udevmonitor() +{ + yesno "${udev_monitor:-no}" || return 0 + + if yesno "${udev_monitor_keep_running:-no}"; then + ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" + else + einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" + start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm + fi +} + display_hotplugged_services() { local svcfile= svc= services= for svcfile in "${RC_SVCDIR}"/hotplugged/*; do @@ -191,11 +217,13 @@ _start() disable_hotplug_agent start_udevd || cleanup + start_udevmonitor populate_dev || cleanup check_persistent_net check_udev_works || cleanup + stop_udevmonitor return 0 } |