From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3616C13800E for ; Tue, 31 Jul 2012 17:36:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1924DE0205; Tue, 31 Jul 2012 17:35:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DBAFDE0205 for ; Tue, 31 Jul 2012 17:35:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CD951B4023 for ; Tue, 31 Jul 2012 17:35:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0D51EE5437 for ; Tue, 31 Jul 2012 17:35:57 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1343756124.408660f945441f0978e6415de131530c7d384070.WilliamH@gentoo> Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/udev-gentoo-scripts X-VCS-Files: conf.d/udev init.d/udev X-VCS-Directories: init.d/ conf.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 408660f945441f0978e6415de131530c7d384070 X-VCS-Branch: master Date: Tue, 31 Jul 2012 17:35:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6ae82d69-37fd-4ca0-97d0-89634e541b44 X-Archives-Hash: 28591d276990c44225f2082c4b549d39 commit: 408660f945441f0978e6415de131530c7d384070 Author: William Hubbs gentoo org> AuthorDate: Tue Jul 31 16:52:11 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jul 31 17:35:24 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=408660f9 Allow an optional wait for uevent processing Systemd allows the wait for uevents during boot to be optional, so we should do the same. --- conf.d/udev | 8 ++++++++ init.d/udev | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/conf.d/udev b/conf.d/udev index 1dfdc79..921d86b 100644 --- a/conf.d/udev +++ b/conf.d/udev @@ -13,6 +13,14 @@ # Expert options: +# Should we wait for all uevents to be processed at boot? +# Most of the time, this should not need to be changed. +#udev_settle_wait="NO" + +# Timeout in seconds to wait for processing of uevents at boot. +# There should be no need to change this. +#udev_settle_timeout="60" + # Add extra command line options to udevd, use with care # udevd --help for possible values #udev_opts="" diff --git a/init.d/udev b/init.d/udev index 20b52d9..4985d5d 100644 --- a/init.d/udev +++ b/init.d/udev @@ -10,6 +10,7 @@ rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} udev_debug="${udev_debug:-no}" udev_monitor="${udev_monitor:-no}" udev_monitor_keep_running="${udev_monitor_keep_running:-no}" +udev_settle_wait="${udev_settle_wait:-NO}" udev_settle_timeout="${udev_settle_timeout:-60}" kv_min="${kv_min:-2.6.34}" @@ -137,7 +138,11 @@ populate_dev() udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add eend $? - + if yesno "${udev_settle_wait}"; then + ebegin "Waiting for uevents to be processed" + udevadm settle --timeout=${udev_settle_timeout} + eend $? + fi udevadm control --property=do_not_run_plug_service= return 0 }