sys-kernel/dracut: Removed patches of not existing ebuilds.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

12 files changed, 20 insertions, 441 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 867a10f37189..2d52e472cd57 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.18 2011/03/29 16:36:10 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.19 2011/03/29 16:40:11 aidecoe Exp $
+
+  29 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  -files/dracut-002-add-missing-functions.patch,
+  -files/dracut-002-custom-paths.patch, -files/dracut-002-dir-symlinks.patch,
+  -files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch,
+  -files/dracut-002-makefile-add-with_switch_root.patch,
+  -files/dracut-002-unmount.patch,
+  -files/dracut-006-console_init-not-necessary.patch,
+  -files/dracut-006-dhcp6.patch, -files/dracut-006-dm-udev-rules.patch,
+  -files/dracut-006-lc-all-c.patch:
+  Removed patches of not existing ebuilds.
 
   29 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-002-r1.ebuild,
   -dracut-003.ebuild, -dracut-004.ebuild, -dracut-006.ebuild,
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index f3982b72dab3..4758178a8fae 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,16 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dracut-002-add-missing-functions.patch 1134 RMD160 4b8298e5d2c632ad33f768070d5520c0618844b6 SHA1 0bab1aac2af402b2531d14ae46ab372ab2d3c015 SHA256 ac64c5c68f8f3f8057646d26b29e6d51e00ce7000dd240b6829cfaee153fcf9b
-AUX dracut-002-custom-paths.patch 995 RMD160 a5eb1f733fe78a40699f028a69f01815c31f1557 SHA1 da30e093309acff0f3728b6b6c7345eb1fcfa94a SHA256 9e0ac4dd0f17e62bf9d3a688143dd0fc7fd1b97e3df9d3e654d3c7ba73d9dc33
-AUX dracut-002-dir-symlinks.patch 3223 RMD160 0783bfd8172d1e27c0ef79a3973bb69e8cd36a4a SHA1 598f4fcc75f4244a9427480efad9f22ed947b402 SHA256 f71f8ad53e2fa0aefe592ad74fd32d2407f1375a8201673d06ffe6d2de02e5dd
-AUX dracut-002-gencmdline-check-for-keyboard-i18n-files.patch 795 RMD160 9f41b536a51a14cfb31e4ad9f9c1c8eae3c14d99 SHA1 c145d1fc5ee99dd1226c62f3dd15c55c482ef58a SHA256 5e19deded988923ac4fe79e525d7964ae8052bb9578fe67847fd873aefaedfe5
-AUX dracut-002-makefile-add-with_switch_root.patch 1517 RMD160 5b936eb43fc6a7248c30d94185907d3b551668b6 SHA1 cb1c1552563ad03c94c96e99c558522931f238f2 SHA256 2f7389c3f869f396b4d3dd0f872314a9f490eea74c95725f8c2909d22789e15c
-AUX dracut-002-unmount.patch 1222 RMD160 4a1ca39fdb84b538047e96963524af9b7ad565c6 SHA1 ce07c883eda5086ce5f9427334276d5c87c517a5 SHA256 6b27f01342b595c19d1324b647b1800d7f0ce4f2bd89da6ee5b14d87ab272f5e
-AUX dracut-006-console_init-not-necessary.patch 937 RMD160 a1f630e7acf2ca7caf5a883621a4fac613484492 SHA1 e8d8179fbd1d46a6c069d7ff55ad31470c76af5c SHA256 dc166a211295dc71fb7a9df59ea606559310c8d64aaedd71d018ca73245bb3dd
-AUX dracut-006-dhcp6.patch 544 RMD160 16f030b7c6184fa7c649aec5e81b2c32f264cb5a SHA1 377138f04c03901cc4499525f5035542d71c61ed SHA256 bec6cdf1a85a3e4df2527ac1d8a2d29a73373bbb878dc93123a6a9711fe3bbbf
-AUX dracut-006-dm-udev-rules.patch 2050 RMD160 6b4a964ac1b2688f2a74694f31b6f02bbb648c53 SHA1 e95ab808d79f093197d729c9c838a2fec42b4a9d SHA256 8d87aa6fc091db9aae03dbfab530d732991879486fb2f777e8f2387bbdedb5f1
-AUX dracut-006-lc-all-c.patch 527 RMD160 8f0edd1dc093cec98ed8e57d8cbff528ea97e6d2 SHA1 aa85bd1df4c25e7a48f35162bcefa1aec981ade5 SHA256 588cff03ef0e1a6e519f3e15626b21a500ba1bc13b0d7493baa544033bd34361
 AUX dracut-007-dm-udev-rules.patch 2048 RMD160 20bb37d057b58a523a5bc28fb69fc3b9c231370c SHA1 867ada86c0949106d5b18c69b9e52dbd3cf28e97 SHA256 690a85d5623e673cb43d228ecf4c669bb9e231ec4fd197dac8d66f957eaa98f6
 AUX dracut-007-multipath-udev-rules.patch 1327 RMD160 616179d21a205b477e729e15b074380432b1154c SHA1 08e20308f983574cb52f567de7fe85d5df61a1e1 SHA256 2df06515c59fe64a461f63444793ae1af287b46be9ddd61f3310f6a87ad830f0
 AUX dracut-008-dm-udev-rules.patch 2199 RMD160 3aa90576ccf5f01ff65a02e8baaa0357dc8e2f62 SHA1 b4cece3c29679d9f6fca5f2a47e2fe7ecde863c2 SHA256 9d3d91155bda4c6197712b013f1cb7bbc4972555189b72b510d7a8ad038ed27c
@@ -25,16 +15,16 @@ EBUILD dracut-007.ebuild 4816 RMD160 3812816e7d41a564f124a4ce6b8d171cfc5060c3 SH
 EBUILD dracut-008-r1.ebuild 5831 RMD160 0db8d18a0387c4769e652080f955e03be6364f70 SHA1 f214b1dc8c8e80021af73ef6f06460f99084027f SHA256 063807d219e84f1ec2f3b8af0be0b1023dd11ec9c4c17d1804a8605c6135bb51
 EBUILD dracut-008.ebuild 5744 RMD160 164ad9849da18ff05acaf28b0033cd6670040378 SHA1 ff917591bbc2b8262731b21aaf616c98fa9720b0 SHA256 448f7370344e0c4327db320401c503d2376cd3ecca0184a487fa578e21b4db90
 EBUILD dracut-009-r1.ebuild 5911 RMD160 9ca9b6f32fbccb9f1b256d178da324c0408ec8cd SHA1 12d79150f7a8ad6e7f9117ba6c8618bcca1cd2bd SHA256 68ca1f5c20c6c7703c65f0bec02b6ffb9e8e143fd31823d2e4ed85b4212b400c
-MISC ChangeLog 5801 RMD160 8fd49144a6b28eda46fde2567a3152083e047ed1 SHA1 c2a26ef1dac3c4c8a5cf770f5bf4fd998071daf2 SHA256 f22085f1bdd14b301d43d4565ea0ea3b77a0f2c0ec0c1620df2783bc7a737ec6
+MISC ChangeLog 6351 RMD160 340f839490fb189a3bafdcde6b302fa1302bdc9e SHA1 5f0dc7d89ab5810fef775bad2f74fae7a87b5e60 SHA256 5760d8a917261a274c73f1a90c00d0a7ee5318cb40b809a08944eb9951ee98de
 MISC metadata.xml 1725 RMD160 39ad0c0c425b5422045655565f4fb4ac0b466ae8 SHA1 cf1a5835711f3cf7b5b25a49dc046d9493f1c6ea SHA256 572c681c3a7996183b74fe19a6da477dccc4184c6f0d0e7c0608f6909611048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNkgp/AAoJEPATRTHh2/q14lcIAITneuNwbjkKoSImdL1FmFAf
-rthT30oCduuolEVTsNMbmL9QKwxb3d/0DxfJ3pqAV7+gmLIDHdoacVFIhmwfde11
-rZoJrYcX0uFVEB1HMQF+ihks0sNTI6LeipgnuNdBGf6oqCZQJFFZ6d4d+ZqWvFYe
-7CwNIShkZZ/eMCGvkZLUU2uw/kWa46nWKiWCO8kQYlJZf5qPR+mrTublJpJmbcv6
-NhZXYXUVjFXaQK3vKohbT5Gm+jbciBI8RF0b4wR1bL6r/4nmBooZtnPgvOSPcWex
-VvFYUNQQ/Gp/ASAYtF6u7C4NntYnOQHLKXAsMB2UVv/q9pHaAq4HxwfyoOMoqJw=
-=82Um
+iQEcBAEBAgAGBQJNkgtwAAoJEPATRTHh2/q1F+EH/j/yiFetSHDpVzGvTw5qDmdz
+lVRdfysJ91Ngs2X+QrCD2bdv+6Q1+dJtBLOCyw4VtH/evtDTIkhW7UgNcvR/CmtF
+JfTW9zuU5YCrTsQJ/IqVSIwKh1nczLNA90rEHMCfOs2qoaO8kWctx3XJF0nQ9DaR
+fP/8XVA4VyzsxdppBtUbLWR3lg/fXq8SsZ/LIlSGZ7sO+pVGnuUxFcRlwy3lg4d7
+rcZ9YX5YIGE3UW4WqYXt+50TFDLx30E4tiqpcDzHJGjFUbgDvJObr7yI5bVJmiDO
++54jEYkAkaCvlURz/jpLwySECcmH1GLGlItb2L5wAUvnR5mxso2LSrpcNCT0/CE=
+=A4Dl
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch b/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch
deleted file mode 100644
index 1b51e3b1de71..000000000000
--- a/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5e5ec023bedc14d709f1d5f8e2803ba171b05daa Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 18 Sep 2009 09:08:23 +0200
-Subject: [PATCH] dracut-gencmdline: add missing functions
-
----
- dracut-gencmdline |   33 +++++++++++++++++++++++++++++++++
- 1 files changed, 33 insertions(+), 0 deletions(-)
-
-diff --git a/dracut-gencmdline b/dracut-gencmdline
-index bab102f..f3cbee1 100755
---- a/dracut-gencmdline
-+++ b/dracut-gencmdline
-@@ -19,6 +19,39 @@
- #
- #. /usr/libexec/initrd-functions
- 
-+IF_verbose=""
-+function set_verbose() {
-+    case $1 in
-+        1|true|yes|on)
-+            IF_verbose="-v"
-+            ;;
-+        0|false|no|off)
-+            IF_verbose=""
-+            ;;
-+    esac
-+}
-+
-+function is_verbose() {
-+    [ -n "$IF_verbose" ] && return 0
-+    return 1
-+}
-+
-+function get_verbose() {
-+    echo "$IF_verbose"
-+    is_verbose
-+}
-+
-+
-+function get_numeric_dev() {
-+(
-+    fmt="%d:%d"
-+    if [ "$1" == "hex" ]; then
-+        fmt="%x:%x"
-+    fi
-+    ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }'
-+) 2>/dev/null
-+}
-+
- 
- function error() {
-     echo "$@" >&2
--- 
-1.6.3.3
-
diff --git a/sys-kernel/dracut/files/dracut-002-custom-paths.patch b/sys-kernel/dracut/files/dracut-002-custom-paths.patch
deleted file mode 100644
index d21cc0ed703a..000000000000
--- a/sys-kernel/dracut/files/dracut-002-custom-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 550fa5f9ae8c6b2fa284d78c090edc5a36991d3a Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Sat, 26 Sep 2009 21:26:43 -0700
-Subject: [PATCH 2/3] custom paths
-
----
- Makefile |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d9ce0f8..f6d162f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,12 @@
- VERSION=002
- GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
- 
--prefix = /usr
--datadir = ${prefix}/share
--pkglibdir = ${datadir}/dracut
--sysconfdir = ${prefix}/etc
--sbindir = ${prefix}/sbin
--mandir = ${prefix}/share/man
-+prefix ?= /usr
-+datadir ?= ${prefix}/share
-+pkglibdir ?= ${datadir}/dracut
-+sysconfdir ?= ${prefix}/etc
-+sbindir ?= ${prefix}/sbin
-+mandir ?= ${prefix}/share/man
- 
- modules.d/99base/switch_root: switch_root.c
- 	gcc -D _GNU_SOURCE -D 'PACKAGE_STRING="dracut"' -std=gnu99 -fsigned-char -g -O2 -o modules.d/99base/switch_root switch_root.c	
--- 
-1.6.3.3
-
diff --git a/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch b/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch
deleted file mode 100644
index 9106e3719259..000000000000
--- a/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 044fbc9ed51e4df819ee5710ed519c566579ff59 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Sat, 26 Sep 2009 21:33:41 -0700
-Subject: [PATCH 3/3] dir symlinks
-
----
- dracut           |    2 +-
- dracut-functions |   43 +++++++++++++++++++++++++++++++++++++------
- 2 files changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/dracut b/dracut
-index b96ad5e..0518969 100755
---- a/dracut
-+++ b/dracut
-@@ -174,7 +174,7 @@ export initdir hookdirs dsrc dracutmodules drivers \
- if [[ $kernel_only != yes ]]; then
-     # Create some directory structure first
-     for d in bin sbin usr/bin usr/sbin usr/lib etc proc sys sysroot tmp dev/pts var/run; do 
--	mkdir -p "$initdir/$d"; 
-+	inst_dir "/$d"; 
-     done
- fi
- 
-diff --git a/dracut-functions b/dracut-functions
-index 2abd6f2..1f2d1e6 100755
---- a/dracut-functions
-+++ b/dracut-functions
-@@ -131,6 +131,36 @@ check_vol_slaves() {
-     return 1
- }
- 
-+# Install a directory, keeping symlinks as on the original system.
-+# Example: if /lib64 points to /lib on the host, "inst_dir /lib/file"
-+# will create ${initdir}/lib64, ${initdir}/lib64/file,
-+# and a symlink ${initdir}/lib -> lib64.
-+inst_dir() {
-+    local dir="$1"
-+    [[ -e "${initdir}$dir" ]] && return 0
-+
-+    # iterate over parent directories
-+    local file=""
-+    local IFS="/"
-+    for part in $dir; do
-+        [ -z "$part" ] && continue
-+        file="$file/$part"
-+        [[ -e "${initdir}$file" ]] && continue
-+
-+        if [ -L "$file" ]; then
-+            # create link as the original
-+            local target=$(readlink "$file")
-+            ln -sfn "$target" "${initdir}$file" || return 1
-+            # resolve relative path and recursively install destionation
-+            [[ "$target" = "${target##*/}" ]] && target="${file%/*}/$target"
-+            inst_dir "$target"
-+        else
-+            # create directory
-+            mkdir -p "${initdir}$file" || return 1
-+        fi
-+    done
-+}
-+
- # $1 = file to copy to ramdisk
- # $2 (optional) Name for the file on the ramdisk
- # Location of the image dir is assumed to be $initdir
-@@ -138,11 +168,11 @@ check_vol_slaves() {
- inst_simple() {
-     local src target
-     [[ -f $1 ]] || return 1
--    src=$1 target=${initdir}${2:-$1}
--    [[ -f $target ]] && return 0
--    mkdir -p "${target%/*}"
-+    src=$1 target="${2:-$1}"
-+    [[ -f ${initdir}$target ]] && return 0
-+    inst_dir "${target%/*}"
-     dinfo "Installing $src" 
--    cp -pfL "$src" "$target"
-+    cp -fL "$src" "${initdir}$target"
- }
- 
- # Same as above, but specialzed to handle dynamic libraries.
-@@ -155,7 +185,7 @@ inst_library() {
- 	reallib=$(readlink -f "$src")
- 	lib=${src##*/}
- 	inst_simple "$reallib" "$reallib"
--	mkdir -p "${initdir}${dest%/*}"
-+	inst_dir "${dest%/*}"
- 	(cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib")
-     else
- 	inst_simple "$src" "$dest"
-@@ -250,7 +280,8 @@ find_rule() {
- # create a function to install them to make life simpler.
- inst_rules() { 
-     local target=/etc/udev/rules.d
--    mkdir -p "$initdir/lib/udev/rules.d" "$initdir$target"
-+    inst_dir "/lib/udev/rules.d"
-+    inst_dir "$target"
-     for rule in "$@"; do 
- 	rule=$(find_rule "$rule") && \
- 	    inst_simple "$rule" "$target/${rule##*/}"
--- 
-1.6.3.3
-
diff --git a/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch b/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch
deleted file mode 100644
index 1497b2d73d11..000000000000
--- a/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6dc6649052d07a6ab0720bd4e866629cb385cb8a Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Mon, 28 Sep 2009 20:30:17 -0700
-Subject: [PATCH] dracut-gencmdline: check for keyboard & i18n files
-
----
- dracut-gencmdline |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut-gencmdline b/dracut-gencmdline
-index f3cbee1..0f2bca1 100755
---- a/dracut-gencmdline
-+++ b/dracut-gencmdline
-@@ -689,8 +689,8 @@ for cryptdev in ${!cryptolv@} ; do
- done
- 
- # output local keyboard/18n settings
--. /etc/sysconfig/keyboard
--. /etc/sysconfig/i18n
-+[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
-+[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
- 
- for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do
-     val=$(eval echo \$$i)
--- 
-1.6.3.3
-
diff --git a/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch b/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch
deleted file mode 100644
index 01a30fb774a2..000000000000
--- a/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b3611b52578dcab5fca78f26ba37406b352a1419 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 23 Nov 2009 11:59:58 +0100
-Subject: Makefile: add WITH_SWITCH_ROOT
-
----
- Makefile |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f6d162f..34cdc65 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,13 @@ mandir ?= ${prefix}/share/man
- modules.d/99base/switch_root: switch_root.c
- 	gcc -D _GNU_SOURCE -D 'PACKAGE_STRING="dracut"' -std=gnu99 -fsigned-char -g -O2 -o modules.d/99base/switch_root switch_root.c	
- 
--all: modules.d/99base/switch_root
-+ifeq (1,${WITH_SWITCH_ROOT})
-+targets = modules.d/99base/switch_root
-+else
-+targets = 
-+endif
-+
-+all: $(targets)
- 
- .PHONY: install clean archive rpm testimage test all check
- 
-@@ -24,12 +30,16 @@ install:
- 	install -m 0755 dracut $(DESTDIR)$(sbindir)/dracut
- 	install -m 0755 dracut-gencmdline $(DESTDIR)$(sbindir)/dracut-gencmdline
- 	install -m 0755 dracut-catimages $(DESTDIR)$(sbindir)/dracut-catimages
-+ifeq (1,${WITH_SWITCH_ROOT})
- 	install -m 0755 modules.d/99base/switch_root $(DESTDIR)$(sbindir)/switch_root
-+endif
- 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
- 	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
- 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
- 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8
-+ifeq (1,${WITH_SWITCH_ROOT})
- 	rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root
-+endif
- 
- clean:
- 	rm -f *~
--- 
-1.6.2.5
-
diff --git a/sys-kernel/dracut/files/dracut-002-unmount.patch b/sys-kernel/dracut/files/dracut-002-unmount.patch
deleted file mode 100644
index 1914b2310f2b..000000000000
--- a/sys-kernel/dracut/files/dracut-002-unmount.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7aa5f85a748dcad3567c878b8623af446f0d8c4f Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Sat, 26 Sep 2009 21:26:06 -0700
-Subject: [PATCH 1/3] fix umount
-
----
- switch_root.c |   13 +++----------
- 1 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/switch_root.c b/switch_root.c
-index 8ce4aaf..1643a71 100644
---- a/switch_root.c
-+++ b/switch_root.c
-@@ -160,22 +160,15 @@ done:
- static int switchroot(const char *newroot)
- {
- 	/*  Don't try to unmount the old "/", there's no way to do it. */
--	const char *umounts[] = { "/dev", "/proc", "/sys", NULL };
-+	const char *umounts[] = { "/dev/pts", "/dev", "/proc", "/sys", NULL };
- 	char *newroot_mnt;
- 	const char *chroot_path = NULL;
- 	int i;
- 	int r = -1;
- 
- 	for (i = 0; umounts[i] != NULL; i++) {
--		char newmount[PATH_MAX];
--
--		snprintf(newmount, sizeof(newmount), "%s%s", newroot, umounts[i]);
--
--		if (mount(umounts[i], newmount, NULL, MS_MOVE, NULL) < 0) {
--			warn("failed to mount moving %s to %s",
--				umounts[i], newmount);
--			warnx("forcing unmount of %s", umounts[i]);
--			umount2(umounts[i], MNT_FORCE);
-+		if (umount2(umounts[i], MNT_FORCE) < 0) {
-+			warn("failed to unmount %s", umounts[i]);
- 		}
- 	}
- 
--- 
-1.6.3.3
-
diff --git a/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch b/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch
deleted file mode 100644
index c7221cb42b50..000000000000
--- a/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9d6ec99daf852a429262c46639558823bf937eab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sat, 10 Jul 2010 22:54:59 +0200
-Subject: [PATCH] 50plymouth: calling console_init isn't necessary
-
----
- modules.d/50plymouth/plymouth-pretrigger.sh |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 8605c61..6bf7f2a 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -15,7 +15,8 @@ if ! getarg rd_NO_PLYMOUTH; then
- 
-     info "Starting plymouth daemon"
-     [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session
--    /lib/udev/console_init tty0
-+    # Workaround for 006.  To be restored in next release.
-+    #/lib/udev/console_init tty0
-     /bin/plymouth --show-splash 2>&1 | vinfo
- fi
- 
--- 
-1.7.1
-
diff --git a/sys-kernel/dracut/files/dracut-006-dhcp6.patch b/sys-kernel/dracut/files/dracut-006-dhcp6.patch
deleted file mode 100644
index 930dcae092ba..000000000000
--- a/sys-kernel/dracut/files/dracut-006-dhcp6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
-index 7362669..a3c9597 100755
---- a/modules.d/40network/parse-ip-opts.sh
-+++ b/modules.d/40network/parse-ip-opts.sh
-@@ -74,7 +74,7 @@ for p in $(getargs ip=); do
- 		die "Sorry, automatic calculation of netmask is not yet supported"
- 	    ;;
- 	auto6);;
--	dhcp|on|any) \
-+	dhcp|dhcp6|on|any) \
- 	    [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
- 	        die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
- 	    [ -n "$ip" ] && \
diff --git a/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch
deleted file mode 100644
index 5924fdeee1b8..000000000000
--- a/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4cd3f9d7e4b8da2cfd5c8b5c4126fe6bd867d56e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 4 Jul 2010 21:21:29 +0200
-Subject: [PATCH 16/41] dm, dmraid, lvm: install udev rules file 64-device-mapper.rules
-
-Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install rules:
-  10-dm.rules
-  11-dm-lvm.rules
-  13-dm-disk.rules
-  95-dm-notify.rules
-but provides only 64-device-mapper.rules combining more or less the
-above rules files.
----
- modules.d/90dm/install     |    3 +++
- modules.d/90dmraid/install |    3 +++
- modules.d/90lvm/install    |    3 +++
- 3 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/modules.d/90dm/install b/modules.d/90dm/install
-index f77d945..0bc9ced 100755
---- a/modules.d/90dm/install
-+++ b/modules.d/90dm/install
-@@ -7,3 +7,6 @@ inst dmsetup
- 
- inst dmeventd
- inst_rules 10-dm.rules 95-dm-notify.rules
-+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-+# files, but provides the one below:
-+inst_rules 64-device-mapper.rules
-diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
-index a016e4d..81c63f0 100755
---- a/modules.d/90dmraid/install
-+++ b/modules.d/90dmraid/install
-@@ -15,6 +15,9 @@ done
- 
- 
- inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
-+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-+# files, but provides the one below:
-+inst_rules 64-device-mapper.rules
- 
- inst "$moddir/dmraid.sh" /sbin/dmraid_scan
- 
-diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
-index 0813486..a189a20 100755
---- a/modules.d/90lvm/install
-+++ b/modules.d/90lvm/install
-@@ -13,6 +13,9 @@ if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then
- fi
- 
- inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
-+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-+# files, but provides the one below:
-+inst_rules 64-device-mapper.rules
- 
- inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
- inst_hook cmdline 30 "$moddir/parse-lvm.sh"
--- 
-1.7.1
-
diff --git a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch
deleted file mode 100644
index 4b13fb2367ae..000000000000
--- a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dracut-functions b/dracut-functions
-index 58f119f..2cd573a 100755
---- a/dracut-functions
-+++ b/dracut-functions
-@@ -248,7 +248,7 @@ inst_binary() {
-     local LDSO NAME IO FILE ADDR I1 n f TLIBDIR
-     [[ -e $initdir$target ]] && return 0
-     # I love bash!
--    ldd $bin 2>/dev/null | while read line; do
-+    LC_ALL=C ldd $bin 2>/dev/null | while read line; do
- 	[[ $line = 'not a dynamic executable' ]] && return 1
- 	if [[ $line =~ not\ found ]]; then
- 	    derror "Missing a shared library required by $bin."