Remove the code to add udev to sysinit runlevel. openrc ebuild does it now. Fix udev-start for older systems.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r1 i686

5 files changed, 50 insertions, 65 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index dd54136a4c8d..51c406cfc17e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.429 2008/12/17 21:33:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.430 2008/12/19 22:40:58 zzam Exp $
+
+  19 Dec 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-postmount-135-r2.initd, files/udev-start-135-r2.sh,
+  udev-135-r2.ebuild:
+  Remove the code to add udev to sysinit runlevel. openrc ebuild does it
+  now. Fix udev-start for older systems.
 
   17 Dec 2008; Matthias Schwarzott <zzam@gentoo.org>
   files/udev-135-r2.initd:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index da29790fcf46..cbd68f61c688 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -26,6 +26,7 @@ AUX udev-135-rules-update.diff 491 RMD160 175c31cc04287059b88abe4eff41b548c07808
 AUX udev-dev-tarball-135-r2.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
 AUX udev-mount-135-r2.initd 2727 RMD160 cdc0d9a8ebaa1160488cbcf41be7d6c6d380e387 SHA1 87c0e5371a67f228b5b276f5e548c73b5ba3e53c SHA256 f1f794e030f7fc34e0e2de1d986b1354cd61fd51778b87ad8d5665017ef6a5b0
 AUX udev-postmount-130-r2.initd 541 RMD160 88bcdfee21d301385d1a6ef59303825042efd335 SHA1 b89322e2c5a24492593ee8165d042b7039214adf SHA256 00dc2047e16505a89c38571ea50c4ba453ffdee4b9aebe81ca41572f9d62e30e
+AUX udev-postmount-135-r2.initd 508 RMD160 c4cc6666d98050024eb28738203bd92c0e4fa1d2 SHA1 db42443945c3c06fb7c951a0d69879b32f9366ce SHA256 21e53535357a5851305e1bdc377a9b3b2eddf85fb9ab55a7efef6e28183d8913
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
 AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268
@@ -33,7 +34,7 @@ AUX udev-start-118-r2.sh 5072 RMD160 24b469dc45b70b6eac82ae3a32f1fb8b0d062c5f SH
 AUX udev-start-122-r1.sh 5776 RMD160 50d9aa7d13dbbe04b13d85aee785caa3be36bcd4 SHA1 91216ac58a61a4f5c0d73751f773efb3ffecc8e7 SHA256 6590e4a4bc9a56ec3ead0cef1d7727dc565bdc90dccbbd33dcb56b7f320176ad
 AUX udev-start-126.sh 5788 RMD160 77352965a177c5cc476f2d62f59c41e546160c94 SHA1 ae2fa5d4b3d64e46c162b807e153f733b0233730 SHA256 dfe276618d5ef4e0148bee23c3edbb07e99afcba64a0d58df494932a527824ba
 AUX udev-start-133.sh 6228 RMD160 06b60d7214c0228560aa46a69de6dfe21ed0fd97 SHA1 01a0dd48be7eb170e560f1875311e5ae56feb754 SHA256 00110f6e6bfdbdf0edf76f25c162fd1d1103f8316b8808dfc023001cd6c74de1
-AUX udev-start-135-r2.sh 881 RMD160 f8ad56c70b2e1d9a52a0578d4371a349a5e3b335 SHA1 7036cca6f5ede064cd335d3908c26e0c838a57fc SHA256 b8dca1426537220eb91f5738a4fc4841ead61b425557c3f5ff7df1226af1c390
+AUX udev-start-135-r2.sh 911 RMD160 929b1621e4512dc5f41b2c4b991a36d8a713f3bd SHA1 e594b8d8bfe0ae74d50bac379b777d1c6a0eeee0 SHA256 fac53ab852a95470a11d994fe54bb7883444c1e51b7f0c51bbdaf49093ab9b23
 AUX udev-stop-111-r2.sh 2389 RMD160 a3dcd87b999576f552c3a36f43513c68eabf40dd SHA1 a107387dfe9d0e5bbb470cc89186b49248b4e2a9 SHA256 41f0b053033ceaadf1e9334540c129a879aedb35de88f8aff0b3464009fa04fa
 AUX udev-stop-118-r2.sh 2160 RMD160 0c3c40fbe3f931a3a8a41b9bcc98b5d6f6592f45 SHA1 9327cd3f6fd805b198ca7f75dcc839a6ebd04066 SHA256 ebda8f0e744e842b2dc563e58ec9bb18f981c9003a4446fdf95cbbe90df5e62e
 AUX udev-stop-126.sh 2164 RMD160 339a3e5aeb9cdb0ad3be26491f7e00f2590ba522 SHA1 2f37fad8d3450238ddb1b411969af8b109e01f34 SHA256 6012cd0816b119606b0a5e49466b4042d9a0cdc6dc328f83067316abcb2a166c
@@ -63,14 +64,14 @@ EBUILD udev-125-r2.ebuild 10651 RMD160 29da75ff13c83b7f6d2872f83c74a49b2651d489
 EBUILD udev-130-r1.ebuild 9463 RMD160 2c8b5dfb1e7b782ea1bd7e7b43d41f3ba3caadb5 SHA1 f91d861c714d944002e0609efe13a2b78bdaa99a SHA256 2669c6f1cff7c8acc5b43cf0a0720df76c8b6a914c30ba6aacba257b96210dfe
 EBUILD udev-133.ebuild 12181 RMD160 9c69661fddeb4100b46aaa0dfc1d979e12b2ce45 SHA1 435455f10652935300e4130a0d8e0f79d35e873f SHA256 6b69fd2ca2dd17583618665fb46e3aac4569806d8f16f54366cbe52e64f335ba
 EBUILD udev-135-r1.ebuild 12198 RMD160 09f49ca30c37fcedcdb94f483267149291203d2b SHA1 936e5b1043d8642d90e2fb1ad8a768424e23f4b4 SHA256 3fc98af01b313a3cbc73a30e1888712eae4c85a7fb03f80d984017bf240b456d
-EBUILD udev-135-r2.ebuild 12349 RMD160 0be50d9ad29e3da7d9b9eec3210d3f8f4a156c02 SHA1 90d36c7313159ca4f640c89d623b3ba47f60e029 SHA256 fdffc8b077fe397c8ec9281f2f44c311b7f56620ed484e1a8cf7b51052457a48
+EBUILD udev-135-r2.ebuild 11230 RMD160 942d3ef0703e37ca76778f380c9f04d8779d4949 SHA1 32b08efeaefbce0ddc566ba5649885608e5a011b SHA256 12534a745f1902814a865ca80ae14e3b588c926165cd91146155d01740308fc2
 EBUILD udev-135.ebuild 12079 RMD160 88554ff3379d6d74c0537a0848b71e346e5a6108 SHA1 1d2375e4eb0516e4015b534ac4ecb848e8ed5df9 SHA256 8cd73c178e60d06862bbe99f02e86cf0d517edcad6faa5dd0ffe57863355bdb9
-MISC ChangeLog 88294 RMD160 a8da48fef0dc0d06dd4903d0a81251c23b04465f SHA1 20d8fa0aaa945958e35761dd31d23cd25aab9669 SHA256 cffe9132594930adaf71f5409ac0309a1f299b28fe5d91caafd9aeceb6edf72f
+MISC ChangeLog 88550 RMD160 af26582d2e554f77e407567ea78c3c74b2bf277e SHA1 c470936a21ef6e8aa3ca29426ef4f27066bef1ee SHA256 b2000a5a265611ac0f97dad913b3e0ff641e67c53462fbbbec3c8fe9a76082c8
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklJcDsACgkQt2vP6XvVdOcc7gCePGBBl5eHNdZRNF13JLtOzaMx
-A2EAoMsOV/RQ9CUJRZiDbCv3EjGdWER0
-=HLRj
+iEYEARECAAYFAklMIv8ACgkQt2vP6XvVdOcG8wCfb0uKIFY4WAhlVt1JVi6r6HVJ
+02YAn0Dkh41j5hvI83O7coodB+LAWOAV
+=LePH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-postmount-135-r2.initd b/sys-fs/udev/files/udev-postmount-135-r2.initd
new file mode 100755
index 000000000000..bde1f59d159f
--- /dev/null
+++ b/sys-fs/udev/files/udev-postmount-135-r2.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-postmount-135-r2.initd,v 1.1 2008/12/19 22:40:58 zzam Exp $
+
+depend() {
+	need localmount
+}
+
+start() {
+	# check if this system uses udev
+	[ -d /dev/.udev/ ] || return 0
+
+	# store persistent-rules that got created while booting
+	# when / was still read-only
+	/lib/udev/move_tmp_persistent_rules.sh
+}
+
+stop() {
+	:
+}
+
+# vim:ts=4
diff --git a/sys-fs/udev/files/udev-start-135-r2.sh b/sys-fs/udev/files/udev-start-135-r2.sh
index 2b2412cc2b9f..ecda790dc9d4 100644
--- a/sys-fs/udev/files/udev-start-135-r2.sh
+++ b/sys-fs/udev/files/udev-start-135-r2.sh
@@ -3,6 +3,8 @@
 
 [ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
 
+. /lib/udev/shell-compat.sh
+
 compat_volume_nodes()
 {
 	# Only do this for baselayout-1*
@@ -24,6 +26,7 @@ start_initd()
 		_start
 	)
 }
+
 # mount tmpfs on /dev
 start_initd udev-mount || exit 1
 
diff --git a/sys-fs/udev/udev-135-r2.ebuild b/sys-fs/udev/udev-135-r2.ebuild
index 9760df725904..9172696f77f4 100644
--- a/sys-fs/udev/udev-135-r2.ebuild
+++ b/sys-fs/udev/udev-135-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-135-r2.ebuild,v 1.1 2008/12/10 22:29:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-135-r2.ebuild,v 1.2 2008/12/19 22:40:58 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -160,7 +160,7 @@ src_install() {
 	newins "${FILESDIR}"/udev-stop-135-r2.sh udev-stop.sh
 
 	# The udev-post init-script
-	newinitd "${FILESDIR}"/udev-postmount-130-r2.initd udev-postmount
+	newinitd "${FILESDIR}"/udev-postmount-135-r2.initd udev-postmount
 
 	# init-scripts for >=openrc-0.3.1, Bug #240984
 	newinitd "${FILESDIR}/udev-135-r2.initd" udev
@@ -244,60 +244,6 @@ pkg_preinst() {
 
 	has_version "<${CATEGORY}/${PN}-113"
 	previous_less_than_113=$?
-
-	has_version "<${CATEGORY}/${PN}-133"
-	previous_less_than_133=$?
-}
-
-# enable udev init-script, else system will no longer boot
-# after update to openrc-0.3.1, Bug #240984
-enable_udev_init_script() {
-	local result=msg
-
-	if [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
-	then
-		# already enabled
-		result=enabled
-	elif has_version ">=sys-apps/openrc-0.3.1"
-	then
-		# openrc without addon calls - no idea what to do, so just print msg
-		result=msg
-	else
-		local rc_devices=
-		if has_version "sys-apps/openrc"; then
-			# openrc with udev addon calls
-			rc_devices=$(source ${ROOT}/etc/rc.conf; echo $rc_devices)
-			[[ -z "$rc_devices" ]] && rc_devices=auto
-		else
-			# old baselayout
-			rc_devices=$(source ${ROOT}/etc/conf.d/rc; echo $RC_DEVICES)
-		fi
-
-		case ${rc_devices} in
-			auto|udev)	result=add ;;
-		esac
-	fi
-
-	case "$result" in
-	enabled)
-		einfo "udev init-script is already enabled, nothing to do."
-		;;
-	add)
-		# enable udev init-script for new openrc
-		elog "Auto adding udev init script to the sysinit runlevel"
-		mkdir -p "${ROOT}"/etc/runlevels/sysinit
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit
-		;;
-	msg)
-		ewarn
-		ewarn "You need to add the udev init script to the runlevel sysinit,"
-		ewarn "else your system will not be able to boot"
-		ewarn "after updating to >=openrc-0.3.1"
-		ewarn "Run this to enable udev for >=openrc-0.3.1:"
-		ewarn "\trc-update add udev sysinit"
-		ewarn
-		;;
-	esac
 }
 
 fix_old_persistent_net_rules() {
@@ -345,9 +291,15 @@ pkg_postinst() {
 
 	restart_udevd
 
-	if [[ $previous_less_than_133 = 0 ]]
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
 	then
-		enable_udev_init_script
+		ewarn
+		ewarn "You need to add the udev init script to the runlevel sysinit,"
+		ewarn "else your system will not be able to boot"
+		ewarn "after updating to >=openrc-0.4.0"
+		ewarn "Run this to enable udev for >=openrc-0.4.0:"
+		ewarn "\trc-update add udev sysinit"
+		ewarn
 	fi
 
 	# people want reminders, I'll give them reminders.  Odds are they will