Removed 017, because 018 fixes bugs which are not going to be backported to

017.

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

14 files changed, 23 insertions, 1177 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index a5806d25dee7..572b0afcc56f 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.58 2012/04/26 06:30:45 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.59 2012/05/09 10:04:54 aidecoe Exp $
+
+  09 May 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-017-r1.ebuild,
+  -dracut-017-r2.ebuild, -dracut-017-r3.ebuild,
+  -files/dracut-017-convertfs-fix-check-for-usr-bin.patch,
+  -files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch,
+  -files/dracut-017-fstab-sys-no-check-for-dev.patch,
+  -files/dracut-017-fstab-sys-remove-bashism.patch,
+  -files/dracut-017-inst_symlink-parent-dir.patch,
+  -files/dracut-017-multipath-udev-rules.patch,
+  -files/dracut-017-tmpdir-option.patch,
+  -files/dracut-017-usrmount-fstab-comments.patch,
+  -files/dracut-017-usrmount-newroot-etc-check.patch:
+  Removed 017, because 018 fixes bugs which are not going to be backported to
+  017.
 
   26 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-018.ebuild:
   Removed use of WITH_SWITCH_ROOT variables.
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index dc466b49bc3a..143d7b2025ab 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,34 +3,21 @@ Hash: SHA1
 
 AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-014-usrmount-fsck-fix.patch 1208 RMD160 0247c724be5e130e23d89cdfc387612de5fee3f4 SHA1 65d74c80b2ed702a6cf073f0eff819bd6df022b9 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565
-AUX dracut-017-convertfs-fix-check-for-usr-bin.patch 1595 RMD160 f5d8dd5c6284cb45c0cb561f14a255232489cc07 SHA1 d64dc3a154c41938d364bc9b1cc669ec12ed980f SHA256 3a71d98361289613b66831a6c3c2e9490513796df724b9128c403bda6847a99d
-AUX dracut-017-crypt-simplify-rd.luks.uuid-testing.patch 1768 RMD160 6884426fed59aaf7c09482f678178492225afd70 SHA1 6738c265913db46c1d5524b9ccef48e6a9f5086c SHA256 9a77bb9954fa712ba375fdf5281807395c5b6e2162d15d289eecf81f286680a8
-AUX dracut-017-fstab-sys-no-check-for-dev.patch 1076 RMD160 a9ef5dc796f44ac20167ba18497dd43cf88c1333 SHA1 ddf0da2e59b5ac34cacf4152b26635182024673e SHA256 4aa470b3d9f2134a8753b93de7aaafff62efb847c65895449f45cf9207ccad21
-AUX dracut-017-fstab-sys-remove-bashism.patch 977 RMD160 417b2ed46017f34ec6568c13fc852a5564a7e73f SHA1 1bc89b5ca02456317334af47c3bb73cf3dcfbc2f SHA256 919d1a2acde96dc1a62981b9df621e5576f47599167ea78350a36d23f910306a
-AUX dracut-017-inst_symlink-parent-dir.patch 1380 RMD160 351bf89d01557638c4e3186c01885a3b35e35235 SHA1 b109203a0013501612d7425ecb54811a9f954f51 SHA256 bd2adb523917bb3d662fd110b8e56fb53c1f5998014b00648e12f6d3643f522a
-AUX dracut-017-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
-AUX dracut-017-tmpdir-option.patch 2703 RMD160 8cd44edda64f7030362a63ec142d59eda758b3f0 SHA1 5012b0cdbb9d42541d9204352b1ac9b0000e1758 SHA256 d1a676a103f6cfb908b70dbaf3e944df25544486a1e4b10d92d3f7c46117b302
-AUX dracut-017-usrmount-fstab-comments.patch 871 RMD160 38be8d9cfb1e304cd7f57f1389eefb2e7fe4635e SHA1 92b1d6e19af3e3b5da1c04fb538b2269f0fd6ccd SHA256 a16c8ed8c06f11382d762fe8f9b344f4928cd82f97e8f2e4da4354fe049afac8
-AUX dracut-017-usrmount-newroot-etc-check.patch 652 RMD160 6931a095650e5c7777af8224ff18702cb4e72e16 SHA1 ba58e2d77fac977609768d07f62972094b6e7be1 SHA256 799d70346c69cfb7449189bb6ccbc94aa10327d11cc385058f36bee761c81318
 AUX dracut-018-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 DIST dracut-014.tar.bz2 155914 RMD160 bc20154b11f2924fe971f3fecb13ce18630adac5 SHA1 8a041beb9d1ca2b8fcc94c7619fd6b6093f02577 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3
-DIST dracut-017.tar.bz2 165858 RMD160 57b39997142c033d3720981184dc01db0f9dfc3a SHA1 1e391d1ae83114488d4cf556f88726eb10931e88 SHA256 d0271b31f261aa6a3a6e468e985892e7666dd6be6b6354ff231a8f7f4690479c
 DIST dracut-018.tar.bz2 189067 RMD160 52aac6e60525ff4f54b8483f9a7694365792d710 SHA1 70ba92d32e44d34701eff53bc78c5b05fe97a5f8 SHA256 3ebc0e9c9df24802dd4061aea6907670453fc865257885abfd9166af5caccb42
 EBUILD dracut-014-r2.ebuild 6209 RMD160 86d5c2619aa7ab3b0a100711d840be3f2f784f84 SHA1 eb37b4d8ef907cf7733d4f581dc1ffd42cd291ef SHA256 b35e3e732bbb9a155357d62473d20e035f139708b2bd79077e1b6cfee63439d6
-EBUILD dracut-017-r1.ebuild 7549 RMD160 a290e4829fd3668c1227ba78578a1e74979f6b6f SHA1 91f4f0215f577a1839e7fffb7df2039e01907896 SHA256 6a726c927b67069d1dfea504e00583f4ed265c6a869e3bb8b2f7f061f3baf5a9
-EBUILD dracut-017-r2.ebuild 7653 RMD160 9f02d5d2a968344c3a51072be7fa0a6dc6d2669f SHA1 c881428a1b0c56a3a3a6ad322467842b06764321 SHA256 0b107a4d4f7551b4fda169bc585bf4c0926ab8c72cbe5e1f271e72760af13ed9
-EBUILD dracut-017-r3.ebuild 7771 RMD160 214b6ac6526c0da1275d6ffdcf0247c65ca3a696 SHA1 08015dea51a90433dae0b588f69575a314de0baa SHA256 ae0b12331fac2b9a9c4748fb031a523e90f90ff74734b84d52ecbd2c698b5eac
 EBUILD dracut-018.ebuild 7175 RMD160 5d073f8a8a47fcaab65b3ef3d7246b842183def6 SHA1 0d65aa2701fe18d2a18ace228aad2b2f7907a271 SHA256 b4f1aaf03b6f83bc9b0d0ee04014f0b25f622e3482d578db6cc380f7b421dc03
-MISC ChangeLog 20381 RMD160 53ef3ff76c33e9d2863ff98d38f5fda494cf655f SHA1 ba79ca993a8226846713de68d98081bea9cbb410 SHA256 527299ec1858a86004d0e22c0b52d3b1183bca3b57e45a2877195e20476c8caa
+MISC ChangeLog 21068 RMD160 cd51142f1bd5eab534ac472eaa6fc58453ec9e36 SHA1 e915c304bfffbe3c90e166da86e2a69454014305 SHA256 5fda5fe5210698fd6aeb564e5e603ab882e41691cd86a20a7a6ef0ca82e452d3
 MISC metadata.xml 877 RMD160 cf6e2ce3aca26d92e3b0f12b6e01b90fc0c4dd80 SHA1 06e60925a137d8794d6e2351bcc0541b0c105435 SHA256 ad5b9dc7d097e501d72f7f509eed03ff28473066b1f9234b91b99b9a47c9b4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPmOubAAoJEPATRTHh2/q1k4kH/jmq5iTYaaUQLtcGYfVhmRnr
-86CbABJpY+DjUVA7THhc+vtRwjV5xMP4KR+9cJm8weW/lr7cSsJLuGquTIpL4O4D
-vnHR1cupeTP77yshEEA4GKJJ8B3Zn9ZWgWqSF1NyfjOelv7re5XIZKJ2lnpbdSMO
-URrD5IGe0ioUcbgZlEnJ3Koq4qJ3QRXB5xG1Rvft95z7BrrHZLSkbWzShIQUzwk2
-5OFMHL5QJ8GVZseewcYJaXuQENyXfuIn/Qn3K1Tr9enm4u39bIN2u5HAbJEjPmPx
-uLa82BQX/KhsiYZJFr2JfAnxsT+mooZJm55fnsl+xEiWQl2aqndnkHZvsh4We9A=
-=dyNS
+iQEcBAEBAgAGBQJPqkFLAAoJEPATRTHh2/q1u10H/AhDJnCS4LLLRjX/evwOQUDB
+r5Iwxor0lFRgSWHFtyG2nWEkrY6pNEyf8oaHmqwXiDpDcxM9PHZIJslVYOBADjoq
+GUKiTwK4CMDkt6Avy6vdQ+14oV+uUTF2p/6MkGqpbDanAkhE6O63JlhqhF2yWVyr
+EUtPB7vL+ZQY1ugItujC9nP7Lra7MSCjTAZFkmdFCNvu+9WO0GkkRAUZYblQxMLz
+J0CxKxo3dNsmUZRqAdgdvjj3G61nwA6XX8jSmEHszN0xOA4d3nLFg+HQ8SmPoF38
+v9K6rs5otGg6V2q3vhqEVNF8e7iu0sTRcEjU+dKyOg1iCqR+pbZhfwyVXXenRJ0=
+=Rxhm
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-017-r1.ebuild b/sys-kernel/dracut/dracut-017-r1.ebuild
deleted file mode 100644
index e4e73e61a1de..000000000000
--- a/sys-kernel/dracut/dracut-017-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017-r1.ebuild,v 1.2 2012/03/05 07:29:05 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-164
-	app-arch/cpio
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-
-	debug? ( dev-util/strace )
-	device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( sys-fs/mdadm )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-usrmount-fstab-comments.patch"
-	epatch "${FILESDIR}/${P}-usrmount-newroot-etc-check.patch"
-	epatch "${FILESDIR}/${P}-convertfs-fix-check-for-usr-bin.patch"
-	epatch "${FILESDIR}/${P}-crypt-simplify-rd.luks.uuid-testing.patch"
-}
-
-src_compile() {
-	emake WITH_SWITCH_ROOT=0
-}
-
-src_install() {
-	emake WITH_SWITCH_ROOT=0 \
-		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
-		install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
-
-	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
-		|| die 'dracut-version failed'
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		echo
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-		local desc_MODULES="Enable loadable module support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		echo
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn "  CONFIG_MODULES"
-		echo
-	fi
-
-	elog 'To generate the initramfs:'
-	elog '    # mount /boot (if necessary)'
-	elog '    # dracut "" <kernel-version>'
-	elog ''
-	elog 'For command line documentation see dracut.kernel(7).'
-	elog ''
-	elog 'Simple example to select root and resume partition:'
-	elog '    root=/dev/sda1 resume=/dev/sda2'
-	elog ''
-	elog 'To include only dracut modules and kernel drivers for this system,'
-	elog 'use the "-H" option.  Some modules need to be explicitly added with'
-	elog '"-a" option even if required tools are installed.'
-}
diff --git a/sys-kernel/dracut/dracut-017-r2.ebuild b/sys-kernel/dracut/dracut-017-r2.ebuild
deleted file mode 100644
index 8b46d4cd6769..000000000000
--- a/sys-kernel/dracut/dracut-017-r2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017-r2.ebuild,v 1.1 2012/03/26 13:02:17 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-164
-	app-arch/cpio
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-
-	debug? ( dev-util/strace )
-	device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( sys-fs/mdadm )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-usrmount-fstab-comments.patch"
-	epatch "${FILESDIR}/${P}-usrmount-newroot-etc-check.patch"
-	epatch "${FILESDIR}/${P}-convertfs-fix-check-for-usr-bin.patch"
-	epatch "${FILESDIR}/${P}-crypt-simplify-rd.luks.uuid-testing.patch"
-	epatch "${FILESDIR}/${P}-inst_symlink-parent-dir.patch"
-	epatch "${FILESDIR}/${P}-tmpdir-option.patch"
-}
-
-src_compile() {
-	emake WITH_SWITCH_ROOT=0
-}
-
-src_install() {
-	emake WITH_SWITCH_ROOT=0 \
-		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
-		install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
-
-	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
-		|| die 'dracut-version failed'
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		echo
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-		local desc_MODULES="Enable loadable module support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		echo
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn "  CONFIG_MODULES"
-		echo
-	fi
-
-	elog 'To generate the initramfs:'
-	elog '    # mount /boot (if necessary)'
-	elog '    # dracut "" <kernel-version>'
-	elog ''
-	elog 'For command line documentation see dracut.kernel(7).'
-	elog ''
-	elog 'Simple example to select root and resume partition:'
-	elog '    root=/dev/sda1 resume=/dev/sda2'
-	elog ''
-	elog 'To include only dracut modules and kernel drivers for this system,'
-	elog 'use the "-H" option.  Some modules need to be explicitly added with'
-	elog '"-a" option even if required tools are installed.'
-}
diff --git a/sys-kernel/dracut/dracut-017-r3.ebuild b/sys-kernel/dracut/dracut-017-r3.ebuild
deleted file mode 100644
index e514e95784e2..000000000000
--- a/sys-kernel/dracut/dracut-017-r3.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017-r3.ebuild,v 1.1 2012/03/27 16:00:43 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-164
-	app-arch/cpio
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-
-	debug? ( dev-util/strace )
-	device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( sys-fs/mdadm )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-usrmount-fstab-comments.patch"
-	epatch "${FILESDIR}/${P}-usrmount-newroot-etc-check.patch"
-	epatch "${FILESDIR}/${P}-convertfs-fix-check-for-usr-bin.patch"
-	epatch "${FILESDIR}/${P}-crypt-simplify-rd.luks.uuid-testing.patch"
-	epatch "${FILESDIR}/${P}-inst_symlink-parent-dir.patch"
-	epatch "${FILESDIR}/${P}-tmpdir-option.patch"
-	epatch "${FILESDIR}/${P}-fstab-sys-no-check-for-dev.patch"
-	epatch "${FILESDIR}/${P}-fstab-sys-remove-bashism.patch"
-}
-
-src_compile() {
-	emake WITH_SWITCH_ROOT=0
-}
-
-src_install() {
-	emake WITH_SWITCH_ROOT=0 \
-		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
-		install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
-
-	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
-		|| die 'dracut-version failed'
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		echo
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-		local desc_MODULES="Enable loadable module support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		echo
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn "  CONFIG_MODULES"
-		echo
-	fi
-
-	elog 'To generate the initramfs:'
-	elog '    # mount /boot (if necessary)'
-	elog '    # dracut "" <kernel-version>'
-	elog ''
-	elog 'For command line documentation see dracut.kernel(7).'
-	elog ''
-	elog 'Simple example to select root and resume partition:'
-	elog '    root=/dev/sda1 resume=/dev/sda2'
-	elog ''
-	elog 'To include only dracut modules and kernel drivers for this system,'
-	elog 'use the "-H" option.  Some modules need to be explicitly added with'
-	elog '"-a" option even if required tools are installed.'
-}
diff --git a/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch b/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch
deleted file mode 100644
index 257032848480..000000000000
--- a/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b6aaac5020cd2e4ee8aaff300ed1a2dbf7bcd6b4 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 Feb 2012 13:21:51 +0100
-Subject: [PATCH 3/4] 30convertfs/convertfs.sh: correct check for /usr/bin
-
----
- modules.d/30convertfs/convertfs.sh |   17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
-index 69c3b3e..aa2c8b1 100755
---- a/modules.d/30convertfs/convertfs.sh
-+++ b/modules.d/30convertfs/convertfs.sh
-@@ -21,13 +21,13 @@ while [[ "$ROOT" != "${ROOT%/}" ]]; do
-     ROOT=${ROOT%/}
- done
- 
--if [ ! -L $ROOT/var/run ]; then
-+if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
-     echo "Converting /var/run to symlink"
-     mv -f $ROOT/var/run $ROOT/var/run.runmove~
-     ln -sfn ../run $ROOT/var/run
- fi
- 
--if [ ! -L $ROOT/var/lock ]; then
-+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
-     echo "Converting /var/lock to symlink"
-     mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
-     ln -sfn ../run/lock $ROOT/var/lock
-@@ -42,16 +42,19 @@ needconvert() {
-     return 1
- }
- 
-+if ! [ -e "$ROOT/usr/bin" ]; then
-+    echo "$ROOT/usr/bin does not exist!"
-+    echo "Make sure, the kernel command line has enough information"
-+    echo "to mount /usr (man dracut.cmdline)"
-+    exit 1
-+fi
-+
-+
- if ! needconvert; then
-     echo "Your system is already converted."
-     exit 0
- fi
- 
--if [ -e "$ROOT/usr/bin" ]; then
--    echo "$ROOT/usr/bin does not exist"
--    exit 1
--fi
--
- testfile="$ROOT/.usrmovecheck$$"
- rm -f "$testfile"
- > "$testfile"
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch b/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch
deleted file mode 100644
index 43572cb4bafe..000000000000
--- a/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a654b70ec172be6de1662011b723ca2ba8afbd64 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 29 Feb 2012 16:20:02 +0100
-Subject: [PATCH 4/4] 90crypt/parse-crypt.sh: simplify rd.luks.uuid testing
-
----
- modules.d/90crypt/parse-crypt.sh |   15 ++-------------
- 1 files changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
-index 2ab3a9f..f96b59a 100755
---- a/modules.d/90crypt/parse-crypt.sh
-+++ b/modules.d/90crypt/parse-crypt.sh
-@@ -24,21 +24,10 @@ else
-                 printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
-             } >> /etc/udev/rules.d/70-luks.rules.new
- 
--
--            [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \
--            {
--                printf -- 'UUIDS=:\n'
--                printf -- 'for dm in /dev/dm-*; do\n'
--                printf -- '[ -e "$dm" ] || exit 1\n'
--                printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n'
--                printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n'
--                printf -- '[ "x$uuid" = "x$dmid" ] && continue\n'
--                printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n'
--                printf -- 'done\n'
--            } > $hookdir/initqueue/finished/90-crypt.sh
-             uuid=$luksid
-             while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done
--            printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh
-+            printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \
-+                >> $hookdir/initqueue/finished/90-crypt.sh
- 
-             {
-                 printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
deleted file mode 100644
index 86ce9010dd9c..000000000000
--- a/sys-kernel/dracut/files/dracut-017-fstab-sys-no-check-for-dev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6dd4370eaa5a7e627bbd34535b6779eaa41ae44c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 27 Mar 2012 16:00:28 +0200
-Subject: [PATCH 2/2] 95fstab-sys/mount-sys.sh: removed check for existing
- /dev
-
-there are a lot of filesystems, which do not need an actual device node
----
- modules.d/95fstab-sys/mount-sys.sh |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
-index 8c9cb29..54415d1 100755
---- a/modules.d/95fstab-sys/mount-sys.sh
-+++ b/modules.d/95fstab-sys/mount-sys.sh
-@@ -11,10 +11,6 @@ fstab_mount() {
-     info "Mounting from $1"
-     while read _dev _mp _fs _opts _dump _pass _rest; do
-         [ -z "${_dev%%#*}" ] && continue # Skip comment lines
--        if [[ ! "$_fs" =~ "nfs" ]] && [ ! -e "$_dev" ]; then
--            warn "Device $_dev doesn't exist, skipping mount."
--            continue
--        fi
-         if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
-             fsck_single "$_dev" "$_fs"
-         fi
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch b/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
deleted file mode 100644
index 3b6c69ffccbf..000000000000
--- a/sys-kernel/dracut/files/dracut-017-fstab-sys-remove-bashism.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0441230c51121c4a6e184b354a2f3a7cacb47b3b Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 27 Mar 2012 16:00:02 +0200
-Subject: [PATCH 1/2] 95fstab-sys/mount-sys.sh: removed bashism
-
----
- modules.d/95fstab-sys/mount-sys.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
-index 0f660b7..8c9cb29 100755
---- a/modules.d/95fstab-sys/mount-sys.sh
-+++ b/modules.d/95fstab-sys/mount-sys.sh
-@@ -20,8 +20,8 @@ fstab_mount() {
-         fi
-         _fs=$(det_fs "$_dev" "$_fs")
-         info "Mounting $_dev"
--        if [[ -d $NEWROOT/$_mp ]]; then
--            mount -v -t $_fs -o $_opts $_dev $NEWROOT/$_mp 2>&1 | vinfo
-+        if [ -d "$NEWROOT/$_mp" ]; then
-+            mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo
-         else
-             mkdir -p "$_mp"
-             mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch b/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch
deleted file mode 100644
index eb8da2fc4d20..000000000000
--- a/sys-kernel/dracut/files/dracut-017-inst_symlink-parent-dir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f575da6f7ca80c97d0299878b13c71c67f22460f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 26 Mar 2012 00:03:57 +0200
-Subject: [PATCH] inst_symlink: create parent dir if doesn't exist
-
-If symlink is yet alone in target directory, inst_symlink will fail to
-create it.  This is how to reproduce the bug:
-
- # mkdir /tmp/test
- # ln -s /bin/cp /tmp/test/cp
- # ./dracut -l -f -H /tmp/test.img -I /tmp/test/cp
-
-Result:
-
-[...]
-
-I: *** Including modules done ***
-ln: failed to create symbolic link
-`/var/tmp/initramfs.Z5isVu//tmp/test/cp': No such file or directory
-ln: failed to create symbolic link
-`/var/tmp/initramfs.Z5isVu//tmp/test/cp': No such file or directory
-I: Wrote /tmp/test.img:
-
-[...]
-
-Following patch creates directory for the symlink if it doesn't exist.
----
- dracut-functions.sh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index f4ccf53..8082466 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -545,6 +545,7 @@ inst_symlink() {
-             inst "$_realsrc"
-         fi
-     fi
-+    [[ ! -e $initdir/${_target%/*} ]] && inst_dir "${_target%/*}"
-     [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/}
-     ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
- }
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch
deleted file mode 100644
index 2b9cffad38c4..000000000000
--- a/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Feb 2011 01:44:25 +0100
-Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index f78517c..3f4f612 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -58,6 +58,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.4.1
-
diff --git a/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch b/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch
deleted file mode 100644
index 83d004d62b49..000000000000
--- a/sys-kernel/dracut/files/dracut-017-tmpdir-option.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From decb1e033b26a1de80b452338ac7cff37a2471f5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 26 Mar 2012 13:29:07 +0200
-Subject: [PATCH 1/2] add --tmpdir option to cmd line args and tmpdir to
- config file
-
-Default temporary directory used by Dracut is /var/tmp, but users might
-want to change it to /tmp.
----
- dracut.conf |    3 +++
- dracut.sh   |    9 +++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.conf b/dracut.conf
-index a502066..e5fdd85 100644
---- a/dracut.conf
-+++ b/dracut.conf
-@@ -38,3 +38,6 @@ lvmconf="yes"
- 
- # inhibit installation of any fsck tools
- #nofscks="yes"
-+
-+# temporary directory
-+#tmpdir=/var/tmp
-diff --git a/dracut.sh b/dracut.sh
-index 1bf8ad9..5887131 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -80,6 +80,8 @@ Creates initial ramdisk images for preloading modules
-                          Default: /etc/dracut.conf
-   --confdir [DIR]       Specify configuration directory to use *.conf files
-                          from. Default: /etc/dracut.conf.d
-+  --tmpdir [DIR]        Temporary directory to be used instead of default
-+                         /var/tmp.
-   -l, --local           Local mode. Use modules from the current working
-                          directory instead of the system-wide installed in
-                          /usr/lib/dracut/modules.d.
-@@ -225,6 +227,7 @@ while (($# > 0)); do
-         -k|--kmoddir)  read_arg drivers_dir_l        "$@" || shift;;
-         -c|--conf)     read_arg conffile             "$@" || shift;;
-         --confdir)     read_arg confdir              "$@" || shift;;
-+        --tmpdir)      read_arg tmpdir_l             "$@" || shift;;
-         -L|--stdlog)   read_arg stdloglvl_l          "$@" || shift;;
-         --compress)    read_arg compress_l           "$@" || shift;;
-         --prefix)      read_arg prefix_l             "$@" || shift;;
-@@ -411,6 +414,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
-+[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
-+[[ $tmpdir ]] || tmpdir=/var/tmp
- [[ $do_strip ]] || do_strip=no
- [[ $compress_l ]] && compress=$compress_l
- [[ $show_modules_l ]] && show_modules=$show_modules_l
-@@ -544,8 +549,8 @@ elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
-     exit 1
- fi
- 
--readonly TMPDIR=/var/tmp
--readonly initdir=$(mktemp --tmpdir=/var/tmp/ -d -t initramfs.XXXXXX)
-+readonly TMPDIR="$tmpdir"
-+readonly initdir=$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)
- [ -d "$initdir" ] || {
-     dfatal "mktemp failed."
-     exit 1
--- 
-1.7.8.5
-
diff --git a/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch b/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch
deleted file mode 100644
index 4d7f22b75228..000000000000
--- a/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cc74a06f4cf602f198092284d196fc4507bd806c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 Feb 2012 12:54:01 +0100
-Subject: [PATCH 1/4] 98usrmount/mount-usr.sh: ignore comments in fstab
-
----
- modules.d/98usrmount/mount-usr.sh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 3e23b15..f9d049e 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -39,6 +39,7 @@ mount_usr()
-     local _dev _mp _fs _opts _rest _usr_found _ret _freq _passno
-     # check, if we have to mount the /usr filesystem
-     while read _dev _mp _fs _opts _freq _passno; do
-+        [ "${_dev%%#*}" != "$_dev" ] && continue
-         if [ "$_mp" = "/usr" ]; then
-             case "$_dev" in
-                 LABEL=*)
--- 
-1.7.8.4
-
diff --git a/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch b/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch
deleted file mode 100644
index cf5a2c678c4d..000000000000
--- a/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fdcfa200db3d2482ef1f63a4c6d024a556d17337 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 28 Feb 2012 16:35:08 +0100
-Subject: [PATCH 2/4] 98usrmount/mount-usr.sh: check, if we have
- $NEWROOT/etc/fstab
-
----
- modules.d/98usrmount/mount-usr.sh |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index f9d049e..39f75b9 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -73,4 +73,6 @@ mount_usr()
-     fi
- }
- 
--mount_usr
-+if [ -f "$NEWROOT/etc/fstab" ]; then
-+    mount_usr
-+fi
--- 
-1.7.8.4
-