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.77) (envelope-from ) id 1Sl7OB-0006UV-Dh for garchives@archives.gentoo.org; Sat, 30 Jun 2012 23:47:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A389E06D6; Sat, 30 Jun 2012 23:47:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4D2D9E06D6 for ; Sat, 30 Jun 2012 23:47:16 +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 AF9881B4016 for ; Sat, 30 Jun 2012 23:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6B6F1E5440 for ; Sat, 30 Jun 2012 23:47:13 +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: <1341099404.4015c45dbdcb3207bb428d13ee0bc965afa978b1.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 init.d/udev-postmount X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 4015c45dbdcb3207bb428d13ee0bc965afa978b1 X-VCS-Branch: master Date: Sat, 30 Jun 2012 23:47:13 +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: 9bc8bbca-d193-45bb-aa36-95da97ec32bb X-Archives-Hash: 3791d0c74635581beb9272fbe50636cd commit: 4015c45dbdcb3207bb428d13ee0bc965afa978b1 Author: William Hubbs gentoo org> AuthorDate: Sat Jun 30 23:36:44 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Jun 30 23:36:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/udev-gentoo-s= cripts.git;a=3Dcommit;h=3D4015c45d remove udev-postmount Since the persistent net and cd rules generators are removed, there is no longer a function for udev-postmount. --- init.d/udev | 4 --- init.d/udev-postmount | 66 -------------------------------------------= ------ 2 files changed, 0 insertions(+), 70 deletions(-) diff --git a/init.d/udev b/init.d/udev index ff53537..2541a0c 100644 --- a/init.d/udev +++ b/init.d/udev @@ -100,10 +100,6 @@ start_pre() echo "# as we use /etc/init.d/network to set up our network" >> "${f}" fi =20 - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; = then - ewarn "You should add udev-postmount service to your default runlevel.= " - fi - /lib/udev/write_root_link_rule =20 if [ -e /proc/sys/kernel/hotplug ]; then diff --git a/init.d/udev-postmount b/init.d/udev-postmount deleted file mode 100644 index fcf5864..0000000 --- a/init.d/udev-postmount +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -udev_version() -{ - udevadm --version -} - -depend() -{ - need localmount - if [ $(udev_version) -lt 175 ]; then - after dbus # for trigger failed - fi - keyword -vserver -lxc -} - -dir_writeable() -{ - touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ -} - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() -{ - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - local file dest - for file in "${RUNDIR}"/tmp-rules--*; do - dest=3D${file##*tmp-rules--} - [ "$dest" =3D '*' ] && break - type=3D${dest##70-persistent-} - type=3D${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - -start() -{ - RUNDIR=3D$(udevadm info --run) - # check if this system uses udev - [ -d "${RUNDIR}" ] || return 0 - - einfo "Doing udev cleanups" - - 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 -} - -stop() -{ - return 0 -} - -# vim:ts=3D4