From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RYrP7-00028L-AO for garchives@archives.gentoo.org; Fri, 09 Dec 2011 03:45:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C41721C0F1; Fri, 9 Dec 2011 03:45:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1E91721C0F1 for ; Fri, 9 Dec 2011 03:45:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E3371B4029 for ; Fri, 9 Dec 2011 03:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C8A4080042 for ; Fri, 9 Dec 2011 03:45:36 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <573cf60eb9c4aa99a22f0cb9decae3a23010fd5c.WilliamH@gentoo> Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/ X-VCS-Repository: proj/udev-gentoo-scripts X-VCS-Files: init.d/udev-postmount X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 573cf60eb9c4aa99a22f0cb9decae3a23010fd5c Date: Fri, 9 Dec 2011 03:45:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 263315dc-bff4-481d-ae43-4e55a1321436 X-Archives-Hash: 39d1807ec6001963cb5a0da95455608e commit: 573cf60eb9c4aa99a22f0cb9decae3a23010fd5c Author: William Hubbs gentoo org> AuthorDate: Fri Dec 9 03:38:04 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Dec 9 03:38:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/udev-gentoo-s= cripts.git;a=3Dcommit;h=3D573cf60e Make udev-postmount work correctly for all versions of udev Udev-postmount can use udevadm --version to determine which version of udev is running, so we should use that to determine when to run udevadm trigger --type=3Dfailed instead of dropping it entirely. --- init.d/udev-postmount | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/init.d/udev-postmount b/init.d/udev-postmount index 22e2582..41c14c1 100644 --- a/init.d/udev-postmount +++ b/init.d/udev-postmount @@ -1,11 +1,18 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.= initd,v 1.1 2010/10/30 13:53:54 zzam Exp $ + +udev_version() +{ + echo $(udevadm --version) +} =20 depend() { need localmount + if [ $(udev_version) -lt 175 ]; then + after dbus # for trigger failed + fi } =20 dir_writeable() @@ -32,7 +39,6 @@ store_persistent_rules() done } =20 - start() { RUNDIR=3D$(udevadm info --run) @@ -41,6 +47,11 @@ start() =20 einfo "Doing udev cleanups" =20 + if [ $(udev_version) -lt 175 ]; then + # Run the events that failed at first udev trigger + udevadm trigger --type=3Dfailed -v + fi + # store persistent-rules that got created while booting # when / was still read-only store_persistent_rules