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 E41A713800E for ; Tue, 31 Jul 2012 22:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A84C4E05E8; Tue, 31 Jul 2012 22:54:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6F7BBE05E8 for ; Tue, 31 Jul 2012 22:54:49 +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 8BF4A1B401B for ; Tue, 31 Jul 2012 22:54:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 480F6E543B for ; Tue, 31 Jul 2012 22:54:47 +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: <1343774204.bdb566aef830bd7d9f6a346b45590c371c81d6cf.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: bdb566aef830bd7d9f6a346b45590c371c81d6cf X-VCS-Branch: master Date: Tue, 31 Jul 2012 22:54:47 +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: 1458789a-d61c-49c3-a76a-7c7edb3fa402 X-Archives-Hash: 40bc828a57d5a9fc975b36d6fd2ff459 commit: bdb566aef830bd7d9f6a346b45590c371c81d6cf Author: William Hubbs gentoo org> AuthorDate: Tue Jul 31 22:36:44 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jul 31 22:36:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=bdb566ae always wait for uevents I was advised by upstream that we always need to wait for uevents, so make the wait mandatory. --- conf.d/udev | 4 ---- init.d/udev | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/conf.d/udev b/conf.d/udev index 921d86b..667cc8b 100644 --- a/conf.d/udev +++ b/conf.d/udev @@ -13,10 +13,6 @@ # 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" diff --git a/init.d/udev b/init.d/udev index 4985d5d..33b0335 100644 --- a/init.d/udev +++ b/init.d/udev @@ -10,7 +10,6 @@ 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}" @@ -138,11 +137,9 @@ 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 + ebegin "Waiting for uevents to be processed" + udevadm settle --timeout=${udev_settle_timeout} + eend $? udevadm control --property=do_not_run_plug_service= return 0 }