No longer use modprobe-wrapper, that should fix bug 191813 and other breakages caused by our wrapper. This also removes auto-blacklisting of modules that get loaded by modules.autoload. It will break blacklisting of some special aliased modules like pcspkr until bug 192201 is fixed. Now also run persistent-net rules when coldplug is disabled, bug 191466.

Package-Manager: portage-2.1.3.9

9 files changed, 610 insertions, 20 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 31bf86167f09..0f2825869528 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.348 2007/09/10 18:34:10 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.349 2007/09/11 21:50:20 zzam Exp $
+
+*udev-115-r3 (11 Sep 2007)
+
+  11 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/udev-115-add-special-rule-files.diff,
+  +files/udev-115-fix-modprobe-calls.diff, +files/udev-start-115-r3.sh,
+  files/pnp-aliases, +files/udev.conf.post_115, +udev-115-r3.ebuild:
+  No longer use modprobe-wrapper, that should fix bug 191813 and other
+  breakages caused by our wrapper. This also removes auto-blacklisting of
+  modules that get loaded by modules.autoload. It will break blacklisting of
+  some special aliased modules like pcspkr until bug 192201 is fixed. Now also
+  run persistent-net rules when coldplug is disabled, bug 191466.
 
   10 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/udev-115-add-special-rule-files.diff, udev-115-r2.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 80d441581044..71dc2245704b 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -57,10 +57,10 @@ AUX net-104-r10.sh 719 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d SHA1 baa0
 MD5 6e80c0636d03874473a1f17a4af2b6e7 files/net-104-r10.sh 719
 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d files/net-104-r10.sh 719
 SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee files/net-104-r10.sh 719
-AUX pnp-aliases 532 RMD160 e55618791de5f42d70e772a10070101b49ae5d10 SHA1 120f6c93d26751af71d9c3f1c1c84a544619f1ad SHA256 a87f88b7001cdd2b1f6e7218cee55c1dd5d31f268d7236a4d7755e9779f3d66e
-MD5 67b848ecb68168074df040720dbe18e6 files/pnp-aliases 532
-RMD160 e55618791de5f42d70e772a10070101b49ae5d10 files/pnp-aliases 532
-SHA256 a87f88b7001cdd2b1f6e7218cee55c1dd5d31f268d7236a4d7755e9779f3d66e files/pnp-aliases 532
+AUX pnp-aliases 537 RMD160 e0144801b7b9c77eb4897692678b75a661723725 SHA1 8276e2dd1a3be1aa2343797b3f9906606d58c9ca SHA256 690b32a166d060c1c663030c51d5b2298eb9d314c8cef737373e0b16ed751e99
+MD5 1ba6e5c819d68d9ef1e330dfca53315f files/pnp-aliases 537
+RMD160 e0144801b7b9c77eb4897692678b75a661723725 files/pnp-aliases 537
+SHA256 690b32a166d060c1c663030c51d5b2298eb9d314c8cef737373e0b16ed751e99 files/pnp-aliases 537
 AUX seq_node.sh 1628 RMD160 2851f756afdcf1a7ee8c9e7652e129ce6a71d828 SHA1 b991fe67410841471a978429b18b1c660cf366f9 SHA256 e79b4f5dc92714d6051912188cce0cc827bb0cd7a662f13cbdef2218bba65cee
 MD5 7532c45b87b0ee7d13627088d95845e3 files/seq_node.sh 1628
 RMD160 2851f756afdcf1a7ee8c9e7652e129ce6a71d828 files/seq_node.sh 1628
@@ -109,10 +109,14 @@ AUX udev-114-root-link-2.diff 4677 RMD160 47b040b51ed0dc637ff2197373db5173bc5985
 MD5 fd97ab764c587e21b8fadaa171e2688f files/udev-114-root-link-2.diff 4677
 RMD160 47b040b51ed0dc637ff2197373db5173bc59854e files/udev-114-root-link-2.diff 4677
 SHA256 d212407420bb46a541e547d59862668745dd8b516b6be6e6619cf967ab2124f9 files/udev-114-root-link-2.diff 4677
-AUX udev-115-add-special-rule-files.diff 3049 RMD160 7ff8822ce29777640dd6ffa875460e0fa3eb9a70 SHA1 1a79ebe8bf9d96da319274b91252a3a808a9b9c3 SHA256 fc8b3fa846ef5bbdc2de8b5728562edac60d2130fa3422141faaee9896aa400c
-MD5 3898563fb9c0ec80d415a9dce3395181 files/udev-115-add-special-rule-files.diff 3049
-RMD160 7ff8822ce29777640dd6ffa875460e0fa3eb9a70 files/udev-115-add-special-rule-files.diff 3049
-SHA256 fc8b3fa846ef5bbdc2de8b5728562edac60d2130fa3422141faaee9896aa400c files/udev-115-add-special-rule-files.diff 3049
+AUX udev-115-add-special-rule-files.diff 2981 RMD160 c15caa0751e8188913beeff1881466b7f661ac0a SHA1 ea710dc5ec02c2e4b7b33a81fcaac872c86adc0f SHA256 b336af9566a16fbc74e8fa24f4d1130176dc8836884d6d62ab6b4c7a126b91e0
+MD5 437bd3c2a04e4c265313774b4c9246e4 files/udev-115-add-special-rule-files.diff 2981
+RMD160 c15caa0751e8188913beeff1881466b7f661ac0a files/udev-115-add-special-rule-files.diff 2981
+SHA256 b336af9566a16fbc74e8fa24f4d1130176dc8836884d6d62ab6b4c7a126b91e0 files/udev-115-add-special-rule-files.diff 2981
+AUX udev-115-fix-modprobe-calls.diff 983 RMD160 b8ff9c42ee725280ace07f4be3fdcd2edc19c6e0 SHA1 d849382fb76acaeb9eaf8cb52164a3ab241cdef1 SHA256 6a37d51aa8c73f9425084a37dbd3e67f37d8dc7936738b26d2cbf17809f89dce
+MD5 cf3d8ffda2a34b20040d37c6f5b69f90 files/udev-115-fix-modprobe-calls.diff 983
+RMD160 b8ff9c42ee725280ace07f4be3fdcd2edc19c6e0 files/udev-115-fix-modprobe-calls.diff 983
+SHA256 6a37d51aa8c73f9425084a37dbd3e67f37d8dc7936738b26d2cbf17809f89dce files/udev-115-fix-modprobe-calls.diff 983
 AUX udev-115-rules-update.diff 4460 RMD160 cfbfaf9f8d640d023cbc82995ff7c31e326adebd SHA1 b8f1e89c9c94f7898c850dea96850e3adcf55373 SHA256 9ae79f4cecf60d7ca5f10e9bc4400821699ca346fc261677f9a92f9f7cfb09af
 MD5 dc602c4f2a2e552ba8c6c50a674a1adb files/udev-115-rules-update.diff 4460
 RMD160 cfbfaf9f8d640d023cbc82995ff7c31e326adebd files/udev-115-rules-update.diff 4460
@@ -145,6 +149,10 @@ AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SH
 MD5 c1475e16f195d346406e9d296dc1d8a8 files/udev-start-114-r1.sh 6218
 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 files/udev-start-114-r1.sh 6218
 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268 files/udev-start-114-r1.sh 6218
+AUX udev-start-115-r3.sh 5160 RMD160 55843eff0e0e3d85fef44c82ec03ffde9d220617 SHA1 884b54cceb3eeeda3ee29242d1e8d789691495b3 SHA256 83f2d59bbb887d941768ee283c089c9ab1c1bc519a75952448884b1245c58026
+MD5 6e62ef40f61badafe61851c15578f8cc files/udev-start-115-r3.sh 5160
+RMD160 55843eff0e0e3d85fef44c82ec03ffde9d220617 files/udev-start-115-r3.sh 5160
+SHA256 83f2d59bbb887d941768ee283c089c9ab1c1bc519a75952448884b1245c58026 files/udev-start-115-r3.sh 5160
 AUX udev-stop-104-r13.sh 3213 RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 SHA1 0ced2a331cf516019326d87e2b3c7978d2c02d23 SHA256 2762507dc5a640eb66823a87402d1ddae9c3430b47f69ff95a7e55f7c2f95be9
 MD5 b61e1aa841f294d09b73ca53ae22d81e files/udev-stop-104-r13.sh 3213
 RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 files/udev-stop-104-r13.sh 3213
@@ -177,6 +185,10 @@ AUX udev.conf.post_114 405 RMD160 9cb36e1c4fad99ed0d37952d54a6508bc3ad6428 SHA1
 MD5 ad59994b4ee696e9237dbd2e121464be files/udev.conf.post_114 405
 RMD160 9cb36e1c4fad99ed0d37952d54a6508bc3ad6428 files/udev.conf.post_114 405
 SHA256 1d1ea52357d6318c9bc9f4b77e1509d700ef7576eb255e9be9112ea94685e6fb files/udev.conf.post_114 405
+AUX udev.conf.post_115 76 RMD160 f578d7d3057c629b0480161294572c859f99153c SHA1 db31ff02367fd8658231f23ae4dba73dc98c84a2 SHA256 f14f4a99b38825b8fb39873f19068b9aa2a1d023bd874d55f27be7b93f341b52
+MD5 3939caa61fcc6d0dc093a4ee7aeb0082 files/udev.conf.post_115 76
+RMD160 f578d7d3057c629b0480161294572c859f99153c files/udev.conf.post_115 76
+SHA256 f14f4a99b38825b8fb39873f19068b9aa2a1d023bd874d55f27be7b93f341b52 files/udev.conf.post_115 76
 AUX udev.rules-104-r10 10849 RMD160 c68dbf53b1594dabb1dcc378c062122928f60369 SHA1 3e21789891ff6aa0fd23b3955ece6e0833c507e0 SHA256 50a345d2065afeeb6d453c99596066a4054a00552896ea98ed067f128bb075b4
 MD5 402db784651a5e391213680c8ac396fc files/udev.rules-104-r10 10849
 RMD160 c68dbf53b1594dabb1dcc378c062122928f60369 files/udev.rules-104-r10 10849
@@ -249,14 +261,18 @@ EBUILD udev-115-r2.ebuild 9766 RMD160 e8f69a202b02a955b1a452dd2f7d7b7b3f16ea1c S
 MD5 ba3497d6567516638e8e4ab68b07b63a udev-115-r2.ebuild 9766
 RMD160 e8f69a202b02a955b1a452dd2f7d7b7b3f16ea1c udev-115-r2.ebuild 9766
 SHA256 ca1ccefef687dead39e4cfa0f7e7c1b2510df917da40d0df468f328abdcd6866 udev-115-r2.ebuild 9766
+EBUILD udev-115-r3.ebuild 9741 RMD160 dda936e1e3f9cef931396418c25efa2ca9fb3e78 SHA1 a9a9a7d9686361251846c7e82b80731d372eea91 SHA256 de4e5c06c2a08dd30c0d8811010eaeb5d58c4fadc498e93dc7edd08d45166e7f
+MD5 3bd117470b64bb5bb62f07e337014ce9 udev-115-r3.ebuild 9741
+RMD160 dda936e1e3f9cef931396418c25efa2ca9fb3e78 udev-115-r3.ebuild 9741
+SHA256 de4e5c06c2a08dd30c0d8811010eaeb5d58c4fadc498e93dc7edd08d45166e7f udev-115-r3.ebuild 9741
 EBUILD udev-115.ebuild 9491 RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 SHA1 4fd9204e3e969b3034128ed708c454bca91b7a94 SHA256 5f503ab29fced876cff8eee825d5c4d366580c594a1fdb3050771eba6d7f8276
 MD5 a223e37d05e117a40242e898ce94d6f7 udev-115.ebuild 9491
 RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 udev-115.ebuild 9491
 SHA256 5f503ab29fced876cff8eee825d5c4d366580c594a1fdb3050771eba6d7f8276 udev-115.ebuild 9491
-MISC ChangeLog 69835 RMD160 1ba41104c80bca1382470ec92f02fb7e76025d98 SHA1 bceb529a8d92db0345293612009230d1ca8f22a8 SHA256 a0d9630587375c8c670db7a79f2f855033ed1abfe5e0ede976041b80ccf75cdc
-MD5 aa3dba875b2ad14ef7dee46afeaa216a ChangeLog 69835
-RMD160 1ba41104c80bca1382470ec92f02fb7e76025d98 ChangeLog 69835
-SHA256 a0d9630587375c8c670db7a79f2f855033ed1abfe5e0ede976041b80ccf75cdc ChangeLog 69835
+MISC ChangeLog 70471 RMD160 a53ea716c29bb2c94892412faa31bb2ba0e1c974 SHA1 24b3046c62986989811efafbde053f711ce61f40 SHA256 f941012c764d7851b4eaab4620ba85b95c0db5915836480912e0b0569d8081e4
+MD5 cd305f110bbce845277013d7a361d903 ChangeLog 70471
+RMD160 a53ea716c29bb2c94892412faa31bb2ba0e1c974 ChangeLog 70471
+SHA256 f941012c764d7851b4eaab4620ba85b95c0db5915836480912e0b0569d8081e4 ChangeLog 70471
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -309,10 +325,13 @@ SHA256 72db9d525a00b48494c6ad380747ba00f5594b1ac0a05d34e02c0ab5e9868b1d files/di
 MD5 3cb8f92c1ecb7da687b05107a3bad096 files/digest-udev-115-r2 506
 RMD160 6514ad2bb1a71a19e33046c62615ad32d749ab58 files/digest-udev-115-r2 506
 SHA256 ff117ca72ad35f13bc955b2d40e29119d8c46530a0eeff1c71e54ae2ece99cc5 files/digest-udev-115-r2 506
+MD5 3cb8f92c1ecb7da687b05107a3bad096 files/digest-udev-115-r3 506
+RMD160 6514ad2bb1a71a19e33046c62615ad32d749ab58 files/digest-udev-115-r3 506
+SHA256 ff117ca72ad35f13bc955b2d40e29119d8c46530a0eeff1c71e54ae2ece99cc5 files/digest-udev-115-r3 506
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG5Y4st2vP6XvVdOcRApR7AJ9u7Yd7ThO+zEqyndqbvHOQeB3yKQCfbS5o
-QnqHgv7YA40AsWEMtOEgLK0=
-=6RKg
+iD8DBQFG5w2pt2vP6XvVdOcRAvgEAKDhmMlmH5Sd3FAhH4sQfxclZwSHPQCggHie
+mL/by3q+rUnZ9hv+QS18rMY=
+=4cBv
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-115-r3 b/sys-fs/udev/files/digest-udev-115-r3
new file mode 100644
index 000000000000..6d969106793c
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-115-r3
@@ -0,0 +1,6 @@
+MD5 e3143b9e4f49a2d99633db5d39253c27 udev-115-update-20070910.diff.bz2 16364
+RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 udev-115-update-20070910.diff.bz2 16364
+SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763 udev-115-update-20070910.diff.bz2 16364
+MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
+RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
+SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/pnp-aliases b/sys-fs/udev/files/pnp-aliases
index b6c44974a3ff..3675fbbc6999 100644
--- a/sys-fs/udev/files/pnp-aliases
+++ b/sys-fs/udev/files/pnp-aliases
@@ -1,7 +1,7 @@
 # /etc/modprobe.d/pnp-aliases
 #
 # These aliases are used by this udev-rule:
-# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
+# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 #
 # They should help to autoload drivers used by various pnp-devices
 # (if not blacklisted somewhere else)
diff --git a/sys-fs/udev/files/udev-115-add-special-rule-files.diff b/sys-fs/udev/files/udev-115-add-special-rule-files.diff
index 0fef7f5fe4d9..815d2b76d577 100644
--- a/sys-fs/udev/files/udev-115-add-special-rule-files.diff
+++ b/sys-fs/udev/files/udev-115-add-special-rule-files.diff
@@ -52,7 +52,7 @@ Index: udev-git/etc/udev/gentoo/40-video.rules
 ===================================================================
 --- /dev/null
 +++ udev-git/etc/udev/gentoo/40-video.rules
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,24 @@
 +# do not edit this file, it will be overwritten on update
 +
 +# video4linux
@@ -66,8 +66,7 @@ Index: udev-git/etc/udev/gentoo/40-video.rules
 +# device node will be /dev/dri/card?
 +KERNEL=="card*",	GROUP="video"
 +KERNEL=="nvidia*",	GROUP="video"
-+# drac thinks we do not need this. Please bug us if it is needed.
-+#KERNEL=="3dfx*",	GROUP="video"
++KERNEL=="3dfx*",	GROUP="video"
 +
 +# Framebuffer
 +# do we need /dev/fb/0 really?
diff --git a/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff b/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff
new file mode 100644
index 000000000000..20b2bd800b16
--- /dev/null
+++ b/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff
@@ -0,0 +1,23 @@
+Index: udev-git/etc/udev/gentoo/30-kernel-compat.rules
+===================================================================
+--- udev-git.orig/etc/udev/gentoo/30-kernel-compat.rules
++++ udev-git/etc/udev/gentoo/30-kernel-compat.rules
+@@ -34,13 +34,13 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_c
+ 	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+ 	# st/osst:      1 TYPE_TAPE
+ 
+-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
++	ATTRS{type}=="0|7|14",	RUN+="/sbin/modprobe sd_mod"
++	ATTRS{type}=="4|5",	RUN+="/sbin/modprobe sr_mod"
++	ATTRS{type}=="8",	RUN+="/sbin/modprobe ch"
+ 
+ 	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
+-	ATTRS{type}=="1", RUN+="modprobe.sh st"
++		ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end"
++	ATTRS{type}=="1", RUN+="/sbin/modprobe st"
+ 
+ LABEL="kernel_compat_end"
+ 
diff --git a/sys-fs/udev/files/udev-start-115-r3.sh b/sys-fs/udev/files/udev-start-115-r3.sh
new file mode 100644
index 000000000000..5073f8feb3bb
--- /dev/null
+++ b/sys-fs/udev/files/udev-start-115-r3.sh
@@ -0,0 +1,196 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+tmpfs_size="10M"
+
+[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+mount_dev_directory() {
+	# Setup temporary storage for /dev
+	ebegin "Mounting /dev for udev"
+	if [ "${RC_USE_FSTAB}" = "yes" ] ; then
+		mntcmd=$(get_mount_fstab /dev)
+	else
+		unset mntcmd
+	fi
+	if [ -n "${mntcmd}" ] ; then
+		try mount -n ${mntcmd}
+	else
+		mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}"
+		if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then
+			mntcmd="tmpfs"
+		else
+			mntcmd="ramfs"
+		fi
+		# many video drivers require exec access in /dev #92921
+		try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev
+	fi
+	eend $?
+}
+
+populate_udev() {
+	# populate /dev with devices already found by the kernel
+
+	if get_bootparam "nocoldplug" ; then
+		RC_COLDPLUG="no"
+		ewarn "Skipping udev coldplug as requested in kernel cmdline"
+	fi
+
+	# at this point we are already sure to use kernel 2.6.15 or newer
+	ebegin "Populating /dev with existing devices through uevents"
+	if [ "${RC_COLDPLUG}" = "yes" ]; then
+		/sbin/udevtrigger
+	else
+		# only create device nodes
+		/sbin/udevtrigger --attr-match=dev
+		# run persistent-net stuff, bug 191466
+		/sbin/udevtrigger --subsystem-match=net
+	fi
+	eend $?
+
+	# loop until everything is finished
+	# there's gotta be a better way...
+	ebegin "Letting udev process events"
+	/sbin/udevsettle --timeout=60
+	eend $?
+
+	rm -f /dev/.udev_populate
+	return 0
+}
+
+seed_dev() {
+	# Seed /dev with some things that we know we need
+	ebegin "Seeding /dev with needed nodes"
+
+	# creating /dev/console and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ ! -c /dev/console ] && mknod /dev/console c 5 1
+	[ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1
+	
+	# udevd will dup its stdin/stdout/stderr to /dev/null
+	# and we do not want a file which gets buffered in ram
+	[ ! -c /dev/null ] && mknod /dev/null c 1 3
+
+	# copy over any persistant things
+	if [ -d /lib/udev/devices ] ; then
+		cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null
+	fi
+
+	# Not provided by sysfs but needed
+	ln -snf /proc/self/fd /dev/fd
+	ln -snf fd/0 /dev/stdin
+	ln -snf fd/1 /dev/stdout
+	ln -snf fd/2 /dev/stderr
+	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+	# Create problematic directories
+	mkdir -p /dev/pts /dev/shm
+	eend 0
+}
+
+unpack_device_tarball() {
+	# Actually get udev rolling
+	if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \
+	    [ -s /lib/udev/state/devices.tar.bz2 ] ; then
+		ebegin "Populating /dev with saved device nodes"
+		try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev
+		eend $?
+	fi
+}
+
+check_persistent_net() {
+	# check if there are problems with persistent-net
+	local syspath=
+	local devs=
+	local problem_found=0
+	for syspath in /sys/class/net/*_rename*; do
+		if [ -d "${syspath}" ]; then
+			devs="${devs} ${syspath##*/}"
+			problem_found=1
+		fi
+	done
+
+	[ "${problem_found}" = 0 ] && return 0
+
+	eerror "UDEV: Your system has a problem assigning persistent names"
+	eerror "to these network interfaces: ${devs}"
+
+	einfo "Checking persistent-net rules:"
+	# the sed-expression lists all duplicate lines
+	# from the input, like "uniq -d" does, but uniq
+	# is installed into /usr/bin and not available at boot.
+	dups=$(
+		RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+		. /lib/udev/rule_generator.functions
+		find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D'
+		)
+	if [ -n "${dups}" ]; then
+		ewarn "The rules create multiple entries assigning these names:"
+		eindent
+		ewarn "${dups}"
+		eoutdent
+	else
+		ewarn "Found no duplicate names in persistent-net rules,"
+		ewarn "there must be some other problem!"
+	fi
+	return 1
+}
+
+main() {
+	if [ $(get_KV) -le $(KV_to_int '2.6.14') ] ; then
+		eerror "Your kernel is too old to work with this version of udev."
+		eerror "Current udev only supports Linux kernel 2.6.15 and newer."
+		return 1
+	fi
+
+	mount_dev_directory
+
+	# Create a file so that our rc system knows it's still in sysinit.
+	# Existance means init scripts will not directly run.
+	# rc will remove the file when done with sysinit.
+	touch /dev/.rcsysinit
+
+	# Selinux lovin; /selinux should be mounted by selinux-patched init
+	if [ -x /sbin/restorecon -a -c /selinux/null ] ; then
+		restorecon /dev > /selinux/null
+	fi
+
+	unpack_device_tarball
+	seed_dev
+
+	if [ -e /proc/sys/kernel/hotplug ] ; then
+		echo "" > /proc/sys/kernel/hotplug
+	fi
+
+	ebegin "Starting udevd"
+	/sbin/udevd --daemon
+	eend $?
+
+	/lib/udev/write_root_link_rule
+	populate_udev
+
+	# Only do this for baselayout-1*
+	if [ ! -e /lib/librc.so ]; then
+
+		# Create nodes that udev can't
+		ebegin "Finalizing udev configuration"
+		[ -x /sbin/lvm ] && \
+			/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
+		# Running evms_activate on a LiveCD causes lots of headaches
+		[ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \
+			/sbin/evms_activate -q &>/dev/null
+		eend 0
+	fi
+
+	check_persistent_net
+
+	# trigger executing initscript when /etc is writable
+	IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null
+
+	# udev started successfully
+	return 0
+}
+
+main
+
+# vim:ts=4
diff --git a/sys-fs/udev/files/udev.conf.post_115 b/sys-fs/udev/files/udev.conf.post_115
new file mode 100644
index 000000000000..42a08351d8e0
--- /dev/null
+++ b/sys-fs/udev/files/udev.conf.post_115
@@ -0,0 +1,3 @@
+# The maximum size reserved for the tmpfs mounted on /dev
+tmpfs_size="10M"
+
diff --git a/sys-fs/udev/udev-115-r3.ebuild b/sys-fs/udev/udev-115-r3.ebuild
new file mode 100644
index 000000000000..6ae4bd8820bf
--- /dev/null
+++ b/sys-fs/udev/udev-115-r3.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r3.ebuild,v 1.1 2007/09/11 21:50:20 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+PATCH="${P}-update-20070910.diff"
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+	mirror://gentoo/${PATCH}.bz2
+	http://dev.gentoo.org/~zzam/distfiles/${PATCH}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug
+	!<sys-fs/device-mapper-1.02.19-r1"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	udev_helper_dir="/$(get_libdir)/udev"
+
+	myconf=
+	extras="extras/ata_id \
+			extras/cdrom_id \
+			extras/edd_id \
+			extras/firmware \
+			extras/floppy \
+			extras/path_id \
+			extras/scsi_id \
+			extras/usb_id \
+			extras/volume_id \
+			extras/collect \
+			extras/rule_generator \
+			extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# comparing kernel version without linux-info.eclass to not pull
+	# virtual/linux-sources
+
+	local KV=$(uname -r)
+	local KV_MAJOR=$(get_major_version ${KV})
+	local KV_MINOR=$(get_version_component_range 2 ${KV})
+	local KV_MICRO=$(get_version_component_range 3 ${KV})
+
+	local ok=0
+	if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then
+		ok=1
+	fi
+
+	if [[ "$ok" = "0" ]]; then
+		ewarn
+		ewarn "${P} does not support Linux kernel before version 2.6.15!"
+		ewarn "If you want to use udev you need to update"
+		ewarn "to kernel >=2.6.15!"
+		ewarn
+		ebeep
+	fi
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	epatch "${WORKDIR}/${PATCH}"
+	EPATCH_OPTS="-p1" epatch "${FILESDIR}/udev-115-add-special-rule-files.diff"
+	epatch "${FILESDIR}/${P}-fix-modprobe-calls.diff"
+	EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff"
+
+	# add blacklisting option where needed
+	#sed	-e '/MODALIAS/s#modprobe#modprobe --use-blacklist#' \
+	#	-e '/while read id/s#modprobe#modprobe --use-blacklist#' \
+	#	-i etc/udev/rules.d/80-drivers.rules
+
+	# no longer needed
+	rm etc/udev/gentoo/50-udev.rules
+
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+	# Do not require xmlto to refresh manpages
+	sed -ie 's|$(MAN_PAGES)||g' Makefile
+
+	# Make sure there is no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	MD5=`md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "644e3c77eb866dee4ff8dda2e95cd187" ]
+	then
+		echo
+		eerror "50-udev-default.rules has been updated, please validate!"
+		die "50-udev-default.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/rules.d/50-udev-default.rules \
+		extras/rule_generator/write_*_rules \
+		udev_rules_parse.c \
+		udev_rules.c
+
+	# Use correct multilib dir
+	sed -i extras/volume_id/lib/Makefile \
+		-e "/ =/s-/lib-/$(get_libdir)-"
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	emake \
+		EXTRAS="${extras}" \
+		libudevdir=${udev_helper_dir} \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die
+}
+
+src_install() {
+	into /
+	emake \
+		DESTDIR="${D}" \
+		libudevdir=${udev_helper_dir} \
+		EXTRAS="${extras}" \
+		${myconf} \
+		install || die
+
+	# make install does not install this
+	dosbin udevstart	|| die "Required binary not installed properly"
+	doman udevstart.8
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "Required binary not installed properly"
+
+	keepdir "${udev_helper_dir}"/state
+	keepdir "${udev_helper_dir}"/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
+	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	into /
+	rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null
+	dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so"
+	into /usr
+	dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a"
+
+	# handle static linking bug #4411
+	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
+	gen_usr_ldscript libvolume_id.so
+
+	# Add gentoo stuff to udev.conf
+	cat "${FILESDIR}"/udev.conf.post_115 >> "${D}"/etc/udev/udev.conf
+
+	# Now installing rules
+	cd etc/udev
+	insinto /etc/udev/rules.d/
+
+	# Our rules files
+	doins gentoo/??-*.rules
+
+	# Adding arch specific rules
+	if [[ -f "packages/40-${ARCH}.rules" ]]; then
+		doins "packages/40-${ARCH}.rules"
+	fi
+	cd "${S}"
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-115-r3.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh
+
+	# The udev-post init-script
+	newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount
+
+	insinto /etc/modprobe.d
+	newins ${FILESDIR}/blacklist-110 blacklist
+	doins ${FILESDIR}/pnp-aliases
+
+	# convert /lib/udev to real used dir
+	sed_helper_dir \
+		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+		"${D}"/etc/init.d/udev* \
+		"${D}"/etc/modprobe.d/*
+
+	# documentation
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
+	doenvd 20udev
+}
+
+pkg_preinst() {
+	if [[ -d "${ROOT}"/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
+	fi
+
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules
+	fi
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+	coldplug_stale=""
+	if [ -f "${ROOT}/etc/init.d/coldplug" ]
+	then
+		coldplug_stale="1"
+	fi
+}
+
+pkg_postinst() {
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	if [[ ${coldplug_stale} == "1" ]] ; then
+		ewarn "A stale coldplug init script found. You should run:"
+		ewarn
+		ewarn "      rc-update del coldplug"
+		ewarn "      rm -f /etc/init.d/coldplug"
+		ewarn
+		ewarn "udev now provides its own coldplug functionality."
+	fi
+
+	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+	if has_version "=sys-fs/udev-103-r3"; then
+		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
+		then
+			ewarn "Deleting stray 40-scsi-hotplug.rules"
+			ewarn "installed by sys-fs/udev-103-r3"
+			rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
+		fi
+	fi
+
+	# Removing some device-nodes we thought we need some time ago
+	if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file
+	if has_version "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+		fi
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete
+	if [[ -d "${ROOT}"/etc/dev.d ]]; then
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null
+		if [[ -d "${ROOT}"/etc/dev.d ]]; then
+			ewarn "You still have the directory /etc/dev.d on your system."
+			ewarn "This is no longer used by udev and can be removed."
+		fi
+	fi
+
+	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+	# remove it if user don't has sys-fs/device-mapper installed
+	if has_version "<sys-fs/udev-113" &&
+		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		! has_version sys-fs/device-mapper
+	then
+			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			einfo "Removed unneeded file 64-device-mapper.rules"
+	fi
+
+	if [[ "${ROOT}" == "/" ]] ; then
+		# check if root of init-process is identical to ours
+		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+			einfo "restarting udevd now."
+			if [[ -n $(pidof udevd) ]] ; then
+				killall -15 udevd &>/dev/null
+				sleep 1
+				killall -9 udevd &>/dev/null
+			fi
+			/sbin/udevd --daemon
+		fi
+	fi
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}