Version bump and revision update

(Portage version: 2.1.8.3/cvs/Linux x86_64)

8 files changed, 563 insertions, 13 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 657625213e27..8ff30a7eaaaf 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.5 2010/07/07 05:32:16 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.6 2010/08/17 18:23:40 ramereth Exp $
+
+*dracut-007 (17 Aug 2010)
+*dracut-006-r1 (17 Aug 2010)
+
+  17 Aug 2010; Lance Albertson <ramereth@gentoo.org> +dracut-006-r1.ebuild,
+  +files/dracut-006-console_init-not-necessary.patch,
+  +files/dracut-006-dm-udev-rules.patch, +dracut-007.ebuild,
+  +files/dracut-007-dm-udev-rules.patch,
+  +files/dracut-007-multipath-udev-rules.patch, metadata.xml:
+  Version bump and revision update
+
+  Update 006 with patches from #329003, bump to 007 to resolve #331903.
+  Thanks to Amadeusz Żołnowski for contributing the ebuilds and patches.
 
 *dracut-006 (07 Jul 2010)
 
diff --git a/sys-kernel/dracut/dracut-006-r1.ebuild b/sys-kernel/dracut/dracut-006-r1.ebuild
new file mode 100644
index 000000000000..2c0a62197c1c
--- /dev/null
+++ b/sys-kernel/dracut/dracut-006-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-006-r1.ebuild,v 1.1 2010/08/17 18:23:40 ramereth Exp $
+
+EAPI=2
+
+inherit eutils mount-boot
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://sourceforge.net/projects/dracut/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_IUSE="btrfs debug lvm mdraid multipath selinux syslog uswsusp xen"
+NETWORK_IUSE="iscsi nbd nfs"
+DM_IUSE="crypt dmraid dmsquash-live"
+IUSE="${COMMON_IUSE} ${DM_IUSE} ${NETWORK_IUSE}"
+
+# common networking deps
+NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-3.1.2_p1 sys-apps/iproute2"
+DM_DEPS="|| ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 )"
+
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=app-shells/dash-0.5.4.11
+	>=sys-apps/module-init-tools-3.5
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.16
+	>=sys-fs/udev-149
+	btrfs? ( sys-fs/btrfs-progs )
+	crypt? ( sys-fs/cryptsetup ${DM_DEPS} )
+	debug? ( dev-util/strace )
+	dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
+	dmsquash-live? ( sys-apps/eject ${DM_DEPS} )
+	iscsi? ( sys-block/open-iscsi[utils] ${NETWORK_DEPS} )
+	lvm? ( >=sys-fs/lvm2-2.02.33 )
+	mdraid? ( sys-fs/mdadm )
+	multipath? ( sys-fs/multipath-tools )
+	nbd? ( sys-block/nbd ${NETWORK_DEPS} )
+	nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
+	uswsusp? ( sys-power/suspend )
+	xen? ( app-emulation/xen )
+	"
+DEPEND="${RDEPEND}"
+
+#
+# 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 m
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm -rf "${modules_dir}"/$m
+		else
+			rm -rf "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-dhcp6.patch"
+	epatch "${FILESDIR}/${P}-lc-all-c.patch"
+	epatch "${FILESDIR}/${P}-dm-udev-rules.patch"
+	epatch "${FILESDIR}/${P}-console_init-not-necessary.patch"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0 prefix=/usr sysconfdir=/etc || die "emake failed"
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		prefix=/usr sysconfdir=/etc \
+		DESTDIR="${D}" install || die "emake install failed"
+
+	dodir /boot/dracut /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README*
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/share/dracut/modules.d"
+
+	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version
+
+	# Disable modules not enabled by USE flags
+	for module in ${IUSE} ; do
+		! use ${module} && rm_module ${module}
+	done
+
+	! any_module ${DM_IUSE} && rm_module 90dm
+	! any_module ${NETWORK_IUSE} && rm_module 45ifcfg 40network
+
+	# Disable S/390 modules which are not tested at all
+	rm_module 95dasd 95dasd_mod 95zfcp 95znet
+
+	# Disable modules which won't work for sure
+	rm_module 01fips 10redhat-i18n 95fcoe
+}
+
+pkg_postinst() {
+	elog 'To generate the initramfs:'
+	elog ' # mount /boot (if necessary)'
+	elog ' # dracut "" <kernel-version>'
+	elog ''
+	elog 'For command line documentation, see:'
+	elog 'http://sourceforge.net/apps/trac/dracut/wiki/commandline'
+	elog ''
+	elog 'Simple example to select root and resume partition:'
+	elog ' root=/dev/???? resume=/dev/????'
+	elog ''
+	elog 'Configuration is in /etc/dracut.conf.'
+	elog 'The default config is very minimal and is highly recommended you'
+	elog 'adjust based on your needs. To include only drivers for this system,'
+	elog 'use the "-H" option.'
+
+	echo
+	ewarn 'dhcp-3 is known to not work with QEMU. You will need dhcp-4 or'
+	ewarn 'later for it.'
+}
diff --git a/sys-kernel/dracut/dracut-007.ebuild b/sys-kernel/dracut/dracut-007.ebuild
new file mode 100644
index 000000000000..8cc69ca1d5d6
--- /dev/null
+++ b/sys-kernel/dracut/dracut-007.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-007.ebuild,v 1.1 2010/08/17 18:23:40 ramereth Exp $
+
+EAPI=2
+
+inherit eutils mount-boot
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://sourceforge.net/projects/dracut/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_IUSE="bootchart btrfs debug gensplash lvm mdraid multipath selinux
+syslog uswsusp xen"
+NETWORK_IUSE="iscsi nbd nfs"
+DM_IUSE="crypt dmraid dmsquash-live"
+IUSE="${COMMON_IUSE} ${DM_IUSE} ${NETWORK_IUSE}"
+
+NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-3.1.2_p1 sys-apps/iproute2"
+DM_DEPS="|| ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 )"
+
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=app-shells/dash-0.5.4.11
+	>=sys-apps/module-init-tools-3.5
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.16
+	>=sys-fs/udev-149
+
+	bootchart? ( app-benchmarks/bootchart )
+	btrfs? ( sys-fs/btrfs-progs )
+	crypt? ( sys-fs/cryptsetup ${DM_DEPS} )
+	debug? ( dev-util/strace )
+	dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
+	dmsquash-live? ( sys-apps/eject ${DM_DEPS} )
+	gensplash? ( media-gfx/splashutils )
+	iscsi? ( sys-block/open-iscsi[utils] ${NETWORK_DEPS} )
+	lvm? ( >=sys-fs/lvm2-2.02.33 )
+	mdraid? ( sys-fs/mdadm )
+	multipath? ( sys-fs/multipath-tools )
+	nbd? ( sys-block/nbd ${NETWORK_DEPS} )
+	nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
+	uswsusp? ( sys-power/suspend )
+	xen? ( app-emulation/xen )
+	"
+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 m
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm -rf "${modules_dir}"/$m
+		else
+			rm -rf "${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}-dm-udev-rules.patch"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0 prefix=/usr sysconfdir=/etc || die "emake failed"
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		prefix=/usr sysconfdir=/etc \
+		DESTDIR="${D}" install || die "emake install failed"
+
+	local gen2conf
+
+	dodir /boot/dracut /var/lib/dracut/overlay /etc/dracut.conf.d
+	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}
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/share/dracut/modules.d"
+
+	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version
+
+	# Disable modules not enabled by USE flags
+	for module in ${IUSE} ; do
+		! use ${module} && rm_module ${module}
+	done
+
+	! any_module ${DM_IUSE} && rm_module 90dm
+	! any_module ${NETWORK_IUSE} && rm_module 45ifcfg 40network
+
+	# Disable S/390 modules which are not tested at all
+	rm_module 95dasd 95dasd_mod 95zfcp 95znet
+
+	# Disable modules which won't work for sure
+	rm_module 95fcoe # no tools
+
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips
+}
+
+pkg_postinst() {
+	elog 'To generate the initramfs:'
+	elog '    # mount /boot (if necessary)'
+	elog '    # dracut "" <kernel-version>'
+	elog ''
+	elog 'For command line documentation see man 7 dracut.kernel.'
+	elog ''
+	elog 'Simple example to select root and resume partition:'
+	elog '    root=/dev/sda1 resume=/dev/sda2'
+	elog ''
+	elog 'The default config (in /etc/dracut.conf) is very minimal and is highly'
+	elog 'recommended you adjust based on your needs. To include only dracut'
+	elog 'modules and kernel drivers for this system, use the "-H" option.'
+	elog 'Some modules need to be explicitly added with "-a" option even if'
+	elog 'required tools are installed.'
+
+	[[ $(base_sys_maj_ver) = 1 ]] && {
+		echo
+		ewarn 'You might encounter following problem during boot time when using'
+		ewarn 'baselayout1:'
+		ewarn '    devpts is already mounted or /dev/pts is busy'
+		ewarn 'See discussion on the Gentoo Forums:'
+		ewarn 'http://forums.gentoo.org/viewtopic-p-6377431.html'
+	}
+
+	echo
+	ewarn 'dhcp-3 is known to not work with QEMU. You will need dhcp-4 or'
+	ewarn 'later for it.'
+}
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
new file mode 100644
index 000000000000..c7221cb42b50
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch
@@ -0,0 +1,26 @@
+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-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch
new file mode 100644
index 000000000000..5924fdeee1b8
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch
@@ -0,0 +1,60 @@
+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-007-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch
new file mode 100644
index 000000000000..a9611d2b6268
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch
@@ -0,0 +1,60 @@
+From 374c91e07c0996d5aacb25ba71b3aa1fcf83afec 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 2/2] 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 3e20866..461d1a7 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.2
+
diff --git a/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch
new file mode 100644
index 000000000000..601569cbe683
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch
@@ -0,0 +1,46 @@
+From 303a1e3dc95c2c876a4e775e78482c35c0a40e20 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 5 Jul 2010 13:09:32 +0200
+Subject: [PATCH 1/2] 90multipath: added kpartx.rules; multipath.rules - different prefix
+
+---
+ modules.d/90multipath/install |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/modules.d/90multipath/install b/modules.d/90multipath/install
+index ed2d698..656b3fd 100755
+--- a/modules.d/90multipath/install
++++ b/modules.d/90multipath/install
+@@ -6,23 +6,22 @@ else
+     LIBDIR="/lib"
+ fi
+ 
++# Last three are for S/390
+ for f in  \
+     /sbin/dmsetup \
+     /sbin/kpartx \
+     /sbin/mpath_wait \
+     /sbin/multipath  \
+     /sbin/multipathd \
+-    /sbin/xdrgetuid \
+-    /sbin/xdrgetprio \
+-    /etc/xdrdevices.conf \
+     /etc/multipath.conf \
+     /etc/multipath/wwids \
+     $(ls $LIBDIR/libmultipath* $LIBDIR/multipath/* 2>/dev/null) \
+-    	;do
+-    [ -e "$f" ] && inst "$f"
++    /sbin/xdrgetuid \
++    /sbin/xdrgetprio \
++    /etc/xdrdevices.conf; do
++        [ -e "$f" ] && inst "$f"
+ done
+ 
+ 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.2
+
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index 7146516448d6..5f8c052cc055 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -7,18 +7,22 @@
 		<name>Lance Albertson</name>
 	</maintainer>
 	<use>
-		<flag name="dmraid">Add support for dmraid devices, also known as
-		ATA-RAID, or Fake RAID.</flag>
-		<flag name="iscsi">Add support for iSCSI</flag>
-		<flag name="lvm">Add support for the Logical Volume Manager
-		sys-apps/lvm2</flag>
-		<flag name="nbd">Add support for network block devices</flag>
-		<flag name="nfs">Add support for NFS</flag>
-		<flag name="md">Add support for MD devices, also known as software raid devices</flag>
-		<flag name="btrfs">Add support for btrfs</flag>
-		<flag name="multipath">Add support for multipath</flag>
-		<flag name="uswsusp">Add support for userspace software suspend</flag>
-		<flag name="xen">Add support for Xen</flag>
+        <flag name="bootchart">Add support for bootchart (app-benchmarks/bootchart)</flag>
+        <flag name="btrfs">Add support for root on Btrfs</flag>
+        <flag name="crypt">Add support for encrypted partitions with cryptsetup/LUKS</flag>
+        <flag name="debug">Module installing additional tools like strace, file editor, ssh and more</flag>
+        <flag name="dmraid">Add support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
+        <flag name="dmsquash-live">Module which might be used for Live CDs</flag>
+        <flag name="gensplash">Add support for framebuffer splash at boot-time</flag>
+        <flag name="iscsi">Add support for iSCSI</flag>
+        <flag name="lvm">Add support for the Logical Volume Manager (sys-apps/lvm2)</flag>
+        <flag name="md">Add support for MD devices, also known as software RAID devices</flag>
+        <flag name="mdraid">Add support for MD devices, also known as software RAID devices</flag>
+        <flag name="multipath">Add support for Device Mapper multipathing</flag>
+        <flag name="nbd">Add support for network block devices</flag>
+        <flag name="nfs">Add support for NFS</flag>
+        <flag name="uswsusp">Add support for uswsusp (sys-power/suspend)</flag>
+        <flag name="xen">Add support for Xen</flag>
 	</use>
 	<longdescription lang="en">
 	Generic, modular initramfs generation tool that can be used across various