[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     4015c45dbdcb3207bb428d13ee0bc965afa978b1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:36:44 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 23:36:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=4015c45d

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
 
-	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
 
 	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=${file##*tmp-rules--}
-		[ "$dest" = '*' ] && break
-		type=${dest##70-persistent-}
-		type=${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=$(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=failed -v
-	fi
-
-	# store persistent-rules that got created while booting
-	# when / was still read-only
-	store_persistent_rules
-}
-
-stop()
-{
-	return 0
-}
-
-# vim:ts=4