Create /run/udev/rules.d when required wrt #453656 by Mike Gilbert

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 155 insertions, 9 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index 097a4e004b96..2c2f6400cd1a 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.33 2013/01/21 21:30:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.34 2013/01/25 20:07:31 ssuominen Exp $
+
+*udev-init-scripts-21-r1 (25 Jan 2013)
+
+  25 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +udev-init-scripts-21-r1.ebuild,
+  +files/udev-init-scripts-21-fix-population-of-run-udev-rules.d-for-newnet.pat
+  ch:
+  Create /run/udev/rules.d when required wrt #453656 by Mike Gilbert
 
   21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
   udev-init-scripts-19-r1.ebuild, udev-init-scripts-21.ebuild,
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 8346751d037a..4efae039cc57 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA256
 
 AUX udev-init-scripts-19-start-only-regular-file.patch 249 SHA256 367a3fd5282bca9846b515165d40ea072ea0390248f080832b650d6439d68f5e SHA512 aa10ba463e3aee6eb878eb13de5ea35b34f98996d35437999b333a8e717dc9e03b6fedeadd2a84815e64f5ffbeded53a849b838e8a700a14b86f7ef8b9e2bb32 WHIRLPOOL f1246fbee309968d6a25f5f11b3aad33120c369ef4c0367c47fd0c596b7b72e0340848c087616bab3a9d826f0ee88799269c510cb075f823b7a5404094970cda
+AUX udev-init-scripts-21-fix-population-of-run-udev-rules.d-for-newnet.patch 1396 SHA256 1bcca24d2e71761dbc655d4177ae6ca5bcc2f689de10a5f6c944e666e509591e SHA512 9dd352203e3e82083600de5f411b0e4369107b9f0955b3c75bdad0b2b3f17959a94deb0b9718aed1fb897416b855eddea4c23061b0170a210577bb8e475f3515 WHIRLPOOL da9c8060f95c8e4bc70367ddfd491641dc2c49e58df6ad1b330b73e732cd9fe362d52685256df7306e456e39b1d14264a561cdfa6159fdc7cc296024d09f8a96
 DIST udev-init-scripts-19.tar.bz2 4792 SHA256 6917206ed2804c044352061c6acb1ca9a86df4a963735660df8e2dce86037916 SHA512 79a3e94b3bf4fc3af4e3bad48fdf6a0124c94efb4ddc346eae360cef8b73040d433d27f55c0d480b6e7ded661b7d899e443213a7083ff6e4758e0125186876dc WHIRLPOOL 48bec0466226e3455213e5f70f0a48ae18ab3ace6606050ccfa0c30ceb422361334fc6056278454c9908e99839f99e8dcce75b2c7ba414616758760f98aa577b
 DIST udev-init-scripts-21.tar.bz2 4852 SHA256 fde1c4e7568442cca5d070d02b6efb5be323b947033ab019ab0c574a1c1ced62 SHA512 f2f8ab69a3bf5b873d5c55061aec141316dd6df4f07f175fcc0b79a14b79c4f826051e89c9b0f936492b7d87ab5373ac7366a4807403a0512ed39641da813218 WHIRLPOOL 083511b4e13f9272d8f57d9bceec76f86bee8996da1f6ea748a6c2c973dce13634eabb1802a6d220557cef4e6c946194ac94f664167bb274b5d8fc701e7c6db7
 EBUILD udev-init-scripts-19-r1.ebuild 2359 SHA256 ca5ebfbeb877d63f51288cfcdc52bf3aed9da2e9b7c1fa5c969721218c8a51d8 SHA512 58b18da36f634f2810fa6cf6e00a082691d388a17903d3b0cdc92eacc7d28eb7e3bc260cf8ca4a4856ca39bb177ffc21b2c5711423b50dc1f3346d1d52db6edb WHIRLPOOL 394ac12df319803d1a775de85de7485d085a25fd4854f166070dcd76bb3a376c3888a9f4a4f16c5f322fea005d321ad0281acb9aab35509f68bd4ec258be457f
+EBUILD udev-init-scripts-21-r1.ebuild 2396 SHA256 7cfcca6dc19025e86ec786f71d50716a49175d45f6e952958b29d7ff272dd530 SHA512 b926ec6f34570dba564b5d38d0b3367c012ddbe1642794c58f33a3c866fe1700fffc6ae75f8e4508c0410899a656e2f687f81386ed390138cc4f8fb18f48089b WHIRLPOOL a9d71084256f4ab73b75502344dba9b451f163caf21895a395dded680bd1d24d2667344bb2704f27c9834827835d4d97d6353e17eafecf8da149bc917ba2b78f
 EBUILD udev-init-scripts-21.ebuild 2314 SHA256 6d75c83d59d0fbcac31756d836c2ef4b4e0950ef6d476b08cf8829a5516715ad SHA512 08d0680a2d5a6fca50f6e5265f5cdd8203853685c80b88d78545d27436c99f69387692dae7b8b3697b113e893b679e73cf61d994b2bc9ac95d57ba7fb4c6c821 WHIRLPOOL f2e0a1e471da32726d754d52ec6b85d7e7280d3c567c26d13f1616a252a1ff62bdf96d0093f280c63df5d2e23aadab8356bd7f68c505e7689b207ada698508e3
 EBUILD udev-init-scripts-9999.ebuild 2317 SHA256 a3a3aa8b5911fe83fd0cc85102533ffcf4d58d73b5ce071585e4a55c02f4c1d2 SHA512 fbeddbf2e1a0dbe32752073523346a998bfb5d78bcb4eadd41dd6d9bd8e6ba1b42d21bc19c8f910f9e0796a9daa6022c2e03b18c7a8348e6cdac134316a399fc WHIRLPOOL 591644955e93d96d8f3ccfbedca735e9e2e81b4366d20cc7d974032b7f8c4cdf23222ee42c4de0fe81d7c5b58a1984ae769ffab9a4e9421168637daef4d41608
-MISC ChangeLog 6176 SHA256 b2aab30645305ead0b881687849e163f932b71cd12cedc3d5c04d0600d7f7ff0 SHA512 1014085e11b4d396db80f5d9e32d322b4cfefdfb9316497aaf8cd65d33acbb35b0f27a228d4d1a1f91b2bb93a4d5ec8b88d7f436362f1a87ebabd58cf8b9a6e3 WHIRLPOOL b791037d58a8a2cb578b352370ec07901b56547232f837d10404aaa9b8dee83202c0275c4d14fa13e059742a66e9ce788f3dcc19e5ebd46d067afe0b6bf552eb
+MISC ChangeLog 6461 SHA256 d5cf9e12880de9a75b5d2685afc468239376a1c8721c343629589114991bf9f7 SHA512 9534e8e7861853cff665cf696e33f7654279b08a4aee9a272957f50eab268d4aae86c79a96a20025e19c135744a7a9db2c86933214082c00765cf95d605ca501 WHIRLPOOL 9f3be88a824152c82014d43ec9fdb8a07749708c73363462d07f2bfb058a3a17dd50c34bd3d543498a9eb0ab17aac32ee116a6903876ebfbe2e49112e268eaff
 MISC metadata.xml 206 SHA256 e8bae0ea2f16b0ad92858b68718c01ab85b5e6995a35b88c74e4ad9772b9f813 SHA512 f6558663be8014488111639a4eeadc9e691f57f2eb4f3c97d6022a50ab2659fac2df458cefed5e29a6661d59221b15332aefa00c027552a8f4bbefc3988e2a90 WHIRLPOOL b515e201c4f614326c4ee0ef0e13fd9d277e913d96265ecce11b41c9628fa38d1e34f90fab1073527e153a9e2e8929c5fee748a8e5eaf98b58fe15928c8ad457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/bNpAAoJEEdUh39IaPFNFj4H/0TpLzbZv5RD23PJRqhKz5if
-3qagkpxqto1bxyoJsu+c9pPpgB7jH3ohiWk05zjoIOreBD2/ukxbmA7+ZCYwhwwp
-6169Kr20PNMKzV3YBqYIV+i/8qblcshxNbxWfM7XJ8jcbKn79gFWB4itW1vMAHPc
-AsCgyAwaRIX9/cXeNfwb1UZBZi1c0Rmv9INWARnfFCwdKpTvE3Oz+2bIBAGX73h1
-Fz8S/B0yybPFJ9hLeHPa0HeuSY8NCY/NLlpIkm/i6D4g1WfvXtSxx+iw3N+mKfvU
-3sxQVOjkcR/7TNb6JbEL/t1GTqnx4jUr6pLa5UQY+dwhxlfoCKFYG/TDdMvDtT0=
-=j6Vw
+iQEcBAEBCAAGBQJRAuXwAAoJEEdUh39IaPFN0pMH/24DB6nx5CBO9ScG03jxGBoQ
+F6u5+XtwZm/BH31OLIPL57sDsbCNPyCyU1bzLYyD4885uo8jghO7La9VD7vB9pb1
+lpcPqgTk+rvHMTY6CO/gdHPm9FyJxxVbSSXcNxhij1765QsHte+gJpQ87l03gIoB
+VDflBsThW4ZmTxemjhefscVc4ryyfotz+hz8g729Vxgd0ddwAsWizC7CQPKnUGHD
+Cw1LLrqRgLTNyCYURFS7lDJ4X19Sp1f+lxU3iMdOcRIQErIcE5b2SWVvD7RsSX8k
+HURFrJvavNnxZdXHJJjvZLsrTc/ky9H7FwIrbQYxTa5wWDp42q51xpi9oB+vbJg=
+=CUD9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev-init-scripts/files/udev-init-scripts-21-fix-population-of-run-udev-rules.d-for-newnet.patch b/sys-fs/udev-init-scripts/files/udev-init-scripts-21-fix-population-of-run-udev-rules.d-for-newnet.patch
new file mode 100644
index 000000000000..470b23d6b47b
--- /dev/null
+++ b/sys-fs/udev-init-scripts/files/udev-init-scripts-21-fix-population-of-run-udev-rules.d-for-newnet.patch
@@ -0,0 +1,50 @@
+From 70b61d96b7ca72b43c447a036cb118511f81d75b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 25 Jan 2013 10:29:53 -0500
+Subject: [PATCH] Fix population of /run/udev/rules.d for newnet
+
+* Create /run/udev/rules.d before dropping files in place.
+* Move disable_oldnet_hotplug to start_pre so that it is done before starting the daemon
+
+http://bugs.gentoo.org/453656
+---
+ init.d/udev | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/init.d/udev b/init.d/udev
+index 342b3af..0a95873 100644
+--- a/init.d/udev
++++ b/init.d/udev
+@@ -100,6 +100,10 @@ start_pre()
+ 		eerror "Unable to find udev executable."
+ 		return 1
+ 	fi
++
++	# Need to do this before starting udev so it will load the rules.
++	disable_oldnet_hotplug
++
+ 	return 0
+ }
+ 
+@@ -118,7 +122,9 @@ disable_oldnet_hotplug()
+ {
+ 	if is_service_enabled network; then
+ 		# disable network hotplugging
+-		local f="/run/udev/rules.d/90-network.rules"
++		local d="/run/udev/rules.d"
++		mkdir -p "${d}"
++		local f="${d}/90-network.rules"
+ 		echo "# This file disables network hotplug events calling" >> "${f}"
+ 		echo "# old-style openrc net scripts" >> "${f}"
+ 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
+@@ -186,7 +192,6 @@ display_hotplugged_services()
+ 
+ start_post()
+ {
+-	disable_oldnet_hotplug
+ 	start_udevmonitor
+ 	populate_dev
+ 	stop_udevmonitor
+-- 
+1.8.1.1
+
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-21-r1.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-21-r1.ebuild
new file mode 100644
index 000000000000..53bf5d6d2774
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-21-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-21-r1.ebuild,v 1.1 2013/01/25 20:07:31 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
+	inherit git-2
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=virtual/udev-180
+	sys-apps/openrc
+	!<sys-fs/udev-186"
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/${P}-fix-population-of-run-udev-rules.d-for-newnet.patch
+	epatch_user
+}
+
+pkg_postinst()
+{
+	# If we are building stages, add udev and udev-mount to the sysinit runlevel
+	# automatically.
+	if use build
+	then
+		if [[ -x "${ROOT}"/etc/init.d/udev \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+		fi
+		if [[ -x "${ROOT}"/etc/init.d/udev-mount \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev-mount \
+				"${ROOT}"/etc/runlevels/sysinit/udev-mount
+		fi
+	fi
+
+	# Warn the user about adding the scripts to their sysinit runlevel
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit ]]
+	then
+		if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+		then
+			ewarn
+			ewarn "You need to add udev to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev sysinit"
+		fi
+		if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev-mount ]]
+		then
+			ewarn
+			ewarn "You need to add udev-mount to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev-mount sysinit"
+		fi
+	fi
+
+	if [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
+}