Updated method to create /dev/root. It now is a symlink and directly created by udev via an injected rule. Added warning about too old kernel to ebuild and udev-start.sh. Now udev-start.sh fails with clear error message and not with messages about failed netlink sockets.

Package-Manager: portage-2.1.3.6

6 files changed, 745 insertions, 9 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 038748e2da31..6c6d964b98c6 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,16 @@
 # 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.329 2007/08/15 07:06:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.330 2007/08/16 22:47:26 zzam Exp $
+
+*udev-114-r1 (16 Aug 2007)
+
+  16 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-start-114-r1.sh, +files/udev-114-root-link-2.diff,
+  +udev-114-r1.ebuild:
+  Updated method to create /dev/root. It now is a symlink and directly created
+  by udev via an injected rule. Added warning about too old kernel to ebuild
+  and udev-start.sh. Now udev-start.sh fails with clear error message and not
+  with messages about failed netlink sockets.
 
   15 Aug 2007; Christian Faulhammer <opfer@gentoo.org> udev-114.ebuild:
   stable x86, bug 188796
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 209ab18380da..00859a3eebb2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -97,6 +97,10 @@ AUX udev-113-r2-rules.diff 1700 RMD160 3f53c55e84b8ebd87e3755126aa166c0b24f699e
 MD5 a4f5d2da091cf0e72ae7281ce1bc5c0c files/udev-113-r2-rules.diff 1700
 RMD160 3f53c55e84b8ebd87e3755126aa166c0b24f699e files/udev-113-r2-rules.diff 1700
 SHA256 403a11829ea28d0c5080c2bd1de25db6be85cf8fb536989dcb0133aa835d055d files/udev-113-r2-rules.diff 1700
+AUX udev-114-root-link-2.diff 4677 RMD160 47b040b51ed0dc637ff2197373db5173bc59854e SHA1 be6ab3162682b4c4cd922d57d356eee4b35d352e SHA256 d212407420bb46a541e547d59862668745dd8b516b6be6e6619cf967ab2124f9
+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-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 MD5 441260cec614a1e9c7d5b70dd811ed3e files/udev-postmount-initd-111-r2 508
 RMD160 e1f42197fe3003ec4691b768a921029ce085becb files/udev-postmount-initd-111-r2 508
@@ -121,6 +125,10 @@ AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SH
 MD5 6b7cd53c08b86df1dd767c3592e68b58 files/udev-start-113-r2.sh 6515
 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 files/udev-start-113-r2.sh 6515
 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046 files/udev-start-113-r2.sh 6515
+AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268
+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-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
@@ -198,14 +206,18 @@ EBUILD udev-113.ebuild 8996 RMD160 fa4abc2291b5944bf318a1c3b56e882a4b41ba63 SHA1
 MD5 5e44719b30fc7810407546fd9c6cddb3 udev-113.ebuild 8996
 RMD160 fa4abc2291b5944bf318a1c3b56e882a4b41ba63 udev-113.ebuild 8996
 SHA256 7e50c34420cf8740805d58e12e00caba5ae7aa59e3faa84f356e867f0a28c384 udev-113.ebuild 8996
+EBUILD udev-114-r1.ebuild 9022 RMD160 ad6f73111fa549cc65c5e749208e5b95269d88db SHA1 55dc2c824f6294f82a5384c47341405ef080fa5a SHA256 ac8353cebc30ba7d645e9d342e74c972c0e666d624e6c3fb2c60fdead0471c0d
+MD5 211f7a297b456f601bb5560c08afd9ce udev-114-r1.ebuild 9022
+RMD160 ad6f73111fa549cc65c5e749208e5b95269d88db udev-114-r1.ebuild 9022
+SHA256 ac8353cebc30ba7d645e9d342e74c972c0e666d624e6c3fb2c60fdead0471c0d udev-114-r1.ebuild 9022
 EBUILD udev-114.ebuild 8784 RMD160 8201d3f9d38613cf6ba184dab7313450ae8efd2f SHA1 9ec7edbb8be6a8578177e90fa8fd873cc832dd8c SHA256 15cd17388da96e97c516efbde067465a43b525a8262ce23b8e684ea8e6ecd97f
 MD5 dbadcf9e6c4390ca298ae53b24333aeb udev-114.ebuild 8784
 RMD160 8201d3f9d38613cf6ba184dab7313450ae8efd2f udev-114.ebuild 8784
 SHA256 15cd17388da96e97c516efbde067465a43b525a8262ce23b8e684ea8e6ecd97f udev-114.ebuild 8784
-MISC ChangeLog 65824 RMD160 d2606efc2a75d30090a2c46880e4999bf7e8927b SHA1 a9cfc3a6f193f6f4065a4abca9b98b48dc8245b5 SHA256 ab88190294ab9d62277704274a71c9b37bf9bf14086d42c6449d7b1a1cc51fbc
-MD5 57c10bbcda718c013a7cc836f480e87e ChangeLog 65824
-RMD160 d2606efc2a75d30090a2c46880e4999bf7e8927b ChangeLog 65824
-SHA256 ab88190294ab9d62277704274a71c9b37bf9bf14086d42c6449d7b1a1cc51fbc ChangeLog 65824
+MISC ChangeLog 66273 RMD160 ef375d51cbd3b53087c2d0de754a697178b9c3ed SHA1 aa363e28dc029b63cc030c2e7e575f792c03dcc6 SHA256 704d096537ae00d3170749b883283e2920972c826d830e592da8cc6b386bc6ef
+MD5 17b2843fd74f0e82b982af43cca538cb ChangeLog 66273
+RMD160 ef375d51cbd3b53087c2d0de754a697178b9c3ed ChangeLog 66273
+SHA256 704d096537ae00d3170749b883283e2920972c826d830e592da8cc6b386bc6ef ChangeLog 66273
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -243,10 +255,13 @@ SHA256 64c3a37d941e4b18999d5848050520182dc7d2096da5fd08b8d3c40928445154 files/di
 MD5 e8bb3b1276a248cbe4bfebec59d41584 files/digest-udev-114 229
 RMD160 f4cdbb1e119921ebb092fa96743ea5baafcd77e3 files/digest-udev-114 229
 SHA256 87ae0d9625cd5aa79055a1b31b05460582cf8fb012cee8a070e3adbe9e8ae717 files/digest-udev-114 229
+MD5 e8bb3b1276a248cbe4bfebec59d41584 files/digest-udev-114-r1 229
+RMD160 f4cdbb1e119921ebb092fa96743ea5baafcd77e3 files/digest-udev-114-r1 229
+SHA256 87ae0d9625cd5aa79055a1b31b05460582cf8fb012cee8a070e3adbe9e8ae717 files/digest-udev-114-r1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGwqYGNQqtfCuFneMRAqhKAJ9Emw6KYrnqxIbPDhNJM25mfKs6AQCglO32
-u5wf0rdw5SQVh7gEThhMaro=
-=UhDh
+iD8DBQFGxNQHt2vP6XvVdOcRAvsKAJsEyHYRwNdJzPCvhCCN4Ni82U4wEgCfdbjK
+oI0LCHJBCnmTOlQabX83Wl8=
+=k9nr
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-114-r1 b/sys-fs/udev/files/digest-udev-114-r1
new file mode 100644
index 000000000000..54e2cbf1a8e7
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-114-r1
@@ -0,0 +1,3 @@
+MD5 c597b3544e650560479edd13b5a5dc8a udev-114.tar.bz2 198912
+RMD160 7f4e4af4a14e62a5260a484f54e2298643081301 udev-114.tar.bz2 198912
+SHA256 d844924f2aa36fffaec1d1a30c0cd1e304224d751c619dce226cce632ad77017 udev-114.tar.bz2 198912
diff --git a/sys-fs/udev/files/udev-114-root-link-2.diff b/sys-fs/udev/files/udev-114-root-link-2.diff
new file mode 100644
index 000000000000..5bd61a2d8c21
--- /dev/null
+++ b/sys-fs/udev/files/udev-114-root-link-2.diff
@@ -0,0 +1,164 @@
+diff -ruN udev-git/extras/root_link/get_dir_major_minor.c udev-git-try/extras/root_link/get_dir_major_minor.c
+--- udev-git/extras/root_link/get_dir_major_minor.c	1970-01-01 01:00:00.000000000 +0100
++++ udev-git-try/extras/root_link/get_dir_major_minor.c	2007-08-16 16:08:30.000000000 +0200
+@@ -0,0 +1,52 @@
++// print out major/minor nr of the device the supplied dir 
++// is mounted on
++//
++// This program is free software; you can redistribute it and/or modify it
++// under the terms of the GNU General Public License as published by the
++// Free Software Foundation version 2 of the License.
++//
++// (c) 2007 Matthias Schwarzott <zzam@gentoo.org>
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++// Getting major/minor
++#include <sys/sysmacros.h>
++int main(int argc, char **argv)
++{
++	struct stat stat_buf;
++	unsigned int dev_major=0, dev_minor=0;
++	dev_t dev;
++
++	if (argc != 2) {
++		printf("Usage:\n");
++		printf("  get_dir_major_minor <directory>\n");
++		return EXIT_FAILURE;
++	}
++
++	if (stat(argv[1], &stat_buf) < 0) {
++		perror("stat");
++		return EXIT_FAILURE;
++	}
++
++	dev = stat_buf.st_dev;
++
++	dev_major = gnu_dev_major(dev);
++	dev_minor = gnu_dev_minor(dev);
++
++
++	if (dev_major == 0) {
++		fprintf(stderr, "Major number is 0.\n");
++		return EXIT_FAILURE;
++	} else
++		printf("%d %d\n",
++			dev_major,
++			dev_minor);
++		
++	return EXIT_SUCCESS;
++}
++
+diff -ruN udev-git/extras/root_link/Makefile udev-git-try/extras/root_link/Makefile
+--- udev-git/extras/root_link/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ udev-git-try/extras/root_link/Makefile	2007-08-16 15:52:01.000000000 +0200
+@@ -0,0 +1,70 @@
++# Makefile for udev extra invoked from the udev main Makefile
++#
++# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
++#
++# Released under the GNU General Public License, version 2.
++#
++
++PROG = get_dir_major_minor
++OBJ =
++HEADERS =
++GEN_HEADERS =
++MAN_PAGES =
++
++prefix =
++etcdir =	${prefix}/etc
++sbindir =	${prefix}/sbin
++usrbindir =	${prefix}/usr/bin
++usrsbindir =	${prefix}/usr/sbin
++libudevdir =	${prefix}/lib/udev
++mandir =	${prefix}/usr/share/man
++configdir =	${etcdir}/udev/
++
++INSTALL = install -c
++INSTALL_PROGRAM = ${INSTALL}
++INSTALL_DATA  = ${INSTALL} -m 644
++INSTALL_SCRIPT = ${INSTALL}
++
++all: $(PROG) $(MAN_PAGES)
++.PHONY: all
++.DEFAULT: all
++
++%.o: %.c $(GEN_HEADERS)
++	$(E) "  CC      " $@
++	$(Q) $(CC) -c $(CFLAGS) $< -o $@
++
++$(PROG): %: $(HEADERS) %.o $(OBJS)
++	$(E) "  LD      " $@
++	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
++
++# man pages
++%.8: %.xml
++	$(E) "  XMLTO   " $@
++	$(Q) xmlto man $?
++.PRECIOUS: %.8
++
++clean:
++	$(E) "  CLEAN   "
++	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
++.PHONY: clean
++
++install-bin: all
++	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
++	$(INSTALL_PROGRAM) -D write_root_link_rule $(DESTDIR)$(libudevdir)/
++.PHONY: install-bin
++
++uninstall-bin:
++	- rm $(DESTDIR)$(libudevdir)/$(PROG)
++.PHONY: uninstall-bin
++
++install-man:
++	@echo "Please create a man page for this tool."
++.PHONY: install-man
++
++uninstall-man:
++	@echo "Please create a man page for this tool."
++.PHONY: uninstall-man
++
++install-config:
++	@echo "no config file to install"
++.PHONY: install-config
+diff -ruN udev-git/extras/root_link/write_root_link_rule udev-git-try/extras/root_link/write_root_link_rule
+--- udev-git/extras/root_link/write_root_link_rule	1970-01-01 01:00:00.000000000 +0100
++++ udev-git-try/extras/root_link/write_root_link_rule	2007-08-16 16:12:23.000000000 +0200
+@@ -0,0 +1,30 @@
++#!/bin/sh
++#
++# This script should run before doing udevtrigger at boot.
++# It will create a rule matching the device directory / is on, and
++# creating /dev/root symlink pointing on its device node.
++#
++# This is especially useful for hal looking at /proc/mounts containing
++# a line listing /dev/root as device:
++#   /dev/root / reiserfs rw 0 0
++# 
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation version 2 of the License.
++#
++# (c) 2007 Matthias Schwarzott <zzam@gentoo.org>
++
++PROG=/lib/udev/get_dir_major_minor
++[ -x "${PROG}" ] && DEV=$(${PROG} "/")
++if [ $? = 0 ]; then
++	MAJOR="${DEV% *}"
++	MINOR="${DEV#* }"
++
++	[ -d /dev/.udev/rules.d ] || mkdir -p /dev/.udev/rules.d
++	RULES=/dev/.udev/rules.d/10-root-link.rules
++
++	echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}"
++	echo "# This rule should create /dev/root as link to real root device." >> "${RULES}"
++	echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$MAJOR\", ENV{MINOR}==\"$MINOR\", SYMLINK+=\"root\"" >> "${RULES}"
++fi
++
diff --git a/sys-fs/udev/files/udev-start-114-r1.sh b/sys-fs/udev/files/udev-start-114-r1.sh
new file mode 100644
index 000000000000..3f611c2376de
--- /dev/null
+++ b/sys-fs/udev/files/udev-start-114-r1.sh
@@ -0,0 +1,234 @@
+# 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
+
+get_modules_autoload_file() {
+	# code copied from /etc/init.d/modules
+
+	# Should not fail if kernel do not have module
+	# support compiled in ...
+	[ ! -f /proc/modules -o "${RC_SYS}" = "VPS" ] && return 0
+
+	local KV=$(uname -r)
+	local KV_MAJOR=${KV%%.*}
+	local x=${KV#*.}
+	local KV_MINOR=${x%%.*}
+	x=${KV#*.*.}
+	local KV_MICRO=${x%%-*}
+
+	local auto=""
+	if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]; then
+		auto=/etc/modules.autoload
+	else
+		local x= f="/etc/modules.autoload.d/kernel"
+		for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR} ; do
+			if [ -f "${f}-${x}.${RC_SOFTLEVEL}" ] ; then
+				auto="${f}-${x}.${RC_SOFTLEVEL}"
+				break
+			fi
+			if [ "${RC_SOFTLEVEL}" = "${RC_BOOTLEVEL}" -a -f "${f}-${x}.${RC_DEFAULTLEVEL}" ] ; then
+				auto="${f}-${x}.${RC_DEFAULTLEVEL}"
+				break
+			fi
+			if [ -f "${f}-${x}" ] ; then
+				auto="${f}-${x}"
+				break
+			fi
+		done
+	fi
+	echo "${auto}"
+}
+
+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
+
+	# tell modprobe.sh to be verbose to $CONSOLE
+
+	echo "export CONSOLE=${CONSOLE}" > /dev/.udev_populate
+	echo "export TERM=${TERM}" >> /dev/.udev_populate
+	echo "export MODULES_AUTOLOAD_FILE=$(get_modules_autoload_file)" >> /dev/.udev_populate
+
+	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"
+	local opts=
+	[ "${RC_COLDPLUG}" != "yes" ] && opts="--attr-match=dev"
+	/sbin/udevtrigger ${opts}
+	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/udev-114-r1.ebuild b/sys-fs/udev/udev-114-r1.ebuild
new file mode 100644
index 000000000000..8e1fbd1985e9
--- /dev/null
+++ b/sys-fs/udev/udev-114-r1.ebuild
@@ -0,0 +1,310 @@
+# 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-114-r1.ebuild,v 1.1 2007/08/16 22:47:26 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info
+
+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"
+
+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"
+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/rule_generator \
+			extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+	if kernel_is le 2 6 14 >/dev/null; 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_OPTS="-p1" epatch ${FILESDIR}/${PN}-114-root-link-2.diff
+
+	# We already have that rule in 50-udev.rules
+	sed -i extras/cdrom_id/Makefile -e '/60-cdrom_id.rules/d'
+
+	# 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
+
+	# Make sure there is no sudden changes to udev.rules.gentoo
+	# (more for my own needs than anything else ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/50-udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "3ee76822195ebc9c6f89228d29fcb019" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/gentoo/50-udev.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}"/modprobe-114.sh modprobe.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 /
+	dolib extras/volume_id/lib/*.so*
+	into /usr
+	dolib extras/volume_id/lib/*.a
+
+	# handle static linking bug #4411
+	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
+	gen_usr_ldscript libvolume_id.so
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_113 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	doins etc/udev/gentoo/??-*.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-114-r1.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/*
+
+	if use s390; then
+		# s390 does not has persistent mac addresses
+		# and we only have persistence rules for mac.
+		# For now just remove the rules file.
+		rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+	fi
+
+	# 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
+
+}
+
+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
+
+	if has_version "<sys-fs/udev-113" &&
+		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		has_version sys-fs/device-mapper
+	then
+		# change mtime to definitely keep the file
+		touch "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+	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
+	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
+		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"
+}