summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2013-09-17 09:42:09 +0000
committerAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2013-09-17 09:42:09 +0000
commitcffc08e971078d07f2ac71b784cd00cc8eac4bff (patch)
treeba3c1340735aa25e38e7ee259d2c48f210eab7e2
parentRemove poppler mask as everything works now (diff)
downloadgentoo-2-cffc08e971078d07f2ac71b784cd00cc8eac4bff.tar.gz
gentoo-2-cffc08e971078d07f2ac71b784cd00cc8eac4bff.tar.bz2
gentoo-2-cffc08e971078d07f2ac71b784cd00cc8eac4bff.zip
Version bump. Added dash module back and it can be installed optionally. bash
is a module too, now and can be disable at initramfs build time. NEWS ~~~~ dracut-033 ========== - improved hostonly device recognition - improved hostonly module recognition - add dracut.css for dracut.html - do not install udev rules from /etc in generic mode - fixed LABEL= parsing for swap devices - fixed iBFT network setup - url-lib.sh: handle 0-size files with curl - dracut.asc: document debugging dracut on shutdown - if rd.md=0, use dmraid for imsm and ddf - skip empty dracut modules - removed caching of kernel cmdline - fixed iso-scan, if the loop device driver is a kernel module - bcache: support new blkid - fixed ifup udev rules - ifup with dhcp, if no "ip=" specified for the interface dracut-032 ========== - add parameter --print-cmdline This prints the kernel command line parameters for the current disk layout. $ dracut --print-cmdline rd.luks.uuid=luks-e68c8906-6542-4a26-83c4-91b4dd9f0471 rd.lvm.lv=debian/root rd.lvm.lv=debian/usr root=/dev/mapper/debian-root rootflags=rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered rootfstype=ext4 - dracut.sh: add --persistent-policy option and persistent_policy conf option --persistent-policy <policy>: Use <policy> to address disks and partitions. <policy> can be any directory name found in /dev/disk. E.g. "by-uuid", "by-label" - dracut now creates the initramfs without udevadm that means the udev database does not have to populated and the initramfs can be built in a chroot with /sys /dev /proc mounted - renamed dracut_install() to inst_multiple() for consistent naming - if $libdirs is unset, fall back to ld.so.cache paths - always assemble /usr device in initramfs - bash module added (disable it, if you really want dash) - continue to boot, if the main loop times out, in systemd mode - removed inst*() shell pure versions, dracut-install binary is in charge now - fixed ifcfg file generation for vlan - do not include adjtime and localtime anymore - install vt102 terminfo dracut_install() is still there for backwards compat - do not strip files in FIPS mode - fixed iBFT interface configuration - fs-lib: install fsck and fsck.ext* - shutdown: fixed killall_proc_mountpoint() - network: also wait for ethernet interfaces to setup - fixed checking for FIPS mode (Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
-rw-r--r--sys-kernel/dracut/ChangeLog74
-rw-r--r--sys-kernel/dracut/dracut-026-r2.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-027-r3.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-029.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-030.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-031-r1.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-031.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-033.ebuild298
-rw-r--r--sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch41
-rw-r--r--sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch30
10 files changed, 454 insertions, 13 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 250be3b6413b..274411b68104 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,78 @@
# ChangeLog for sys-kernel/dracut
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.128 2013/08/05 17:40:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.129 2013/09/17 09:42:09 aidecoe Exp $
+
+*dracut-033 (14 Sep 2013)
+
+ 14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-026-r2.ebuild,
+ dracut-027-r3.ebuild, dracut-029.ebuild, dracut-030.ebuild,
+ dracut-031.ebuild, dracut-031-r1.ebuild, +dracut-033.ebuild,
+ +files/033-0001-dracut-functions.sh-support-for-altern.patch,
+ +files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch:
+ Version bump. Added dash module back and it can be installed optionally. bash
+ is a module too, now and can be disable at initramfs build time.
+
+ NEWS
+ ~~~~
+ dracut-033
+ ==========
+ - improved hostonly device recognition
+ - improved hostonly module recognition
+ - add dracut.css for dracut.html
+ - do not install udev rules from /etc in generic mode
+ - fixed LABEL= parsing for swap devices
+ - fixed iBFT network setup
+ - url-lib.sh: handle 0-size files with curl
+ - dracut.asc: document debugging dracut on shutdown
+ - if rd.md=0, use dmraid for imsm and ddf
+ - skip empty dracut modules
+ - removed caching of kernel cmdline
+ - fixed iso-scan, if the loop device driver is a kernel module
+ - bcache: support new blkid
+ - fixed ifup udev rules
+ - ifup with dhcp, if no "ip=" specified for the interface
+
+ dracut-032
+ ==========
+ - add parameter --print-cmdline
+ This prints the kernel command line parameters for the current disk
+ layout.
+ $ dracut --print-cmdline
+ rd.luks.uuid=luks-e68c8906-6542-4a26-83c4-91b4dd9f0471
+ rd.lvm.lv=debian/root rd.lvm.lv=debian/usr root=/dev/mapper/debian-root
+ rootflags=rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered
+ rootfstype=ext4
+ - dracut.sh: add --persistent-policy option and persistent_policy conf option
+ --persistent-policy <policy>:
+ Use <policy> to address disks and partitions.
+ <policy> can be any directory name found in /dev/disk.
+ E.g. "by-uuid", "by-label"
+ - dracut now creates the initramfs without udevadm
+ that means the udev database does not have to populated
+ and the initramfs can be built in a chroot with
+ /sys /dev /proc mounted
+ - renamed dracut_install() to inst_multiple() for consistent naming
+ - if $libdirs is unset, fall back to ld.so.cache paths
+ - always assemble /usr device in initramfs
+ - bash module added (disable it, if you really want dash)
+ - continue to boot, if the main loop times out, in systemd mode
+ - removed inst*() shell pure versions, dracut-install binary is in charge now
+ - fixed ifcfg file generation for vlan
+ - do not include adjtime and localtime anymore
+ - install vt102 terminfo
+ dracut_install() is still there for backwards compat
+ - do not strip files in FIPS mode
+ - fixed iBFT interface configuration
+ - fs-lib: install fsck and fsck.ext*
+ - shutdown: fixed killall_proc_mountpoint()
+ - network: also wait for ethernet interfaces to setup
+ - fixed checking for FIPS mode
+
+ 13 Aug 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-026-r2.ebuild,
+ dracut-027-r3.ebuild, dracut-029.ebuild, dracut-030.ebuild,
+ dracut-031.ebuild, dracut-031-r1.ebuild:
+ Update mdadm dependency version to conform upstream dracut.spec. Fixes bug
+ #479544.
*dracut-031-r1 (05 Aug 2013)
diff --git a/sys-kernel/dracut/dracut-026-r2.ebuild b/sys-kernel/dracut/dracut-026-r2.ebuild
index ee52ac191cbc..7176e0fa35a6 100644
--- a/sys-kernel/dracut/dracut-026-r2.ebuild
+++ b/sys-kernel/dracut/dracut-026-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r2.ebuild,v 1.3 2013/07/23 11:47:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r2.ebuild,v 1.4 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -94,7 +94,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-027-r3.ebuild b/sys-kernel/dracut/dracut-027-r3.ebuild
index 0fa32fae32d7..8271976bcb31 100644
--- a/sys-kernel/dracut/dracut-027-r3.ebuild
+++ b/sys-kernel/dracut/dracut-027-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.3 2013/07/23 11:47:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.4 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -94,7 +94,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-029.ebuild b/sys-kernel/dracut/dracut-029.ebuild
index 08de61815171..309258869e97 100644
--- a/sys-kernel/dracut/dracut-029.ebuild
+++ b/sys-kernel/dracut/dracut-029.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.3 2013/07/23 11:47:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.4 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -94,7 +94,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-030.ebuild b/sys-kernel/dracut/dracut-030.ebuild
index 91114c5d6b22..3cfa44a92132 100644
--- a/sys-kernel/dracut/dracut-030.ebuild
+++ b/sys-kernel/dracut/dracut-030.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-030.ebuild,v 1.1 2013/07/25 21:21:52 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-030.ebuild,v 1.2 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -93,7 +93,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-031-r1.ebuild b/sys-kernel/dracut/dracut-031-r1.ebuild
index 01deeb64db43..d98efb3e488a 100644
--- a/sys-kernel/dracut/dracut-031-r1.ebuild
+++ b/sys-kernel/dracut/dracut-031-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031-r1.ebuild,v 1.1 2013/08/05 17:40:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031-r1.ebuild,v 1.2 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -93,7 +93,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-031.ebuild b/sys-kernel/dracut/dracut-031.ebuild
index a718631ea4d2..d01fa7e0adf4 100644
--- a/sys-kernel/dracut/dracut-031.ebuild
+++ b/sys-kernel/dracut/dracut-031.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031.ebuild,v 1.1 2013/08/03 21:07:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031.ebuild,v 1.2 2013/09/17 09:42:09 aidecoe Exp $
EAPI=4
@@ -93,7 +93,7 @@ RDEPEND="${CDEPEND}
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_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
dracut_modules_multipath? ( sys-fs/multipath-tools )
dracut_modules_nbd? ( sys-block/nbd )
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
diff --git a/sys-kernel/dracut/dracut-033.ebuild b/sys-kernel/dracut/dracut-033.ebuild
new file mode 100644
index 000000000000..4e96b7fd91c0
--- /dev/null
+++ b/sys-kernel/dracut/dracut-033.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-033.ebuild,v 1.1 2013/09/17 09:42:09 aidecoe Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 eutils linux-info systemd
+
+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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+ dracut_modules_bootchart? ( !dracut_modules_systemd )
+ dracut_modules_crypt-gpg? ( dracut_modules_crypt )
+ dracut_modules_crypt-loop? ( dracut_modules_crypt )
+ dracut_modules_livenet? ( dracut_modules_dmsquash-live )
+ "
+COMMON_MODULES="
+ dracut_modules_biosdevname
+ dracut_modules_bootchart
+ dracut_modules_btrfs
+ dracut_modules_caps
+ dracut_modules_crypt-gpg
+ dracut_modules_crypt-loop
+ dracut_modules_dash
+ dracut_modules_gensplash
+ dracut_modules_mdraid
+ dracut_modules_multipath
+ dracut_modules_plymouth
+ dracut_modules_syslog
+ dracut_modules_systemd
+ "
+DM_MODULES="
+ dracut_modules_crypt
+ dracut_modules_dmraid
+ dracut_modules_dmsquash-live
+ dracut_modules_livenet
+ dracut_modules_lvm
+ "
+NETWORK_MODULES="
+ dracut_modules_cifs
+ 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 optimization net selinux ${IUSE_DRACUT_MODULES}"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+ dracut_modules_systemd? ( >=sys-apps/systemd-199 )
+ "
+RDEPEND="${CDEPEND}
+ app-arch/cpio
+ >=app-shells/bash-4.0
+ >=sys-apps/baselayout-1.12.14-r1
+ >sys-apps/kmod-5[tools]
+ >=sys-apps/sysvinit-2.87-r3
+ >=sys-apps/util-linux-2.21
+ virtual/pkgconfig
+
+ debug? ( dev-util/strace )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
+ net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
+ selinux? ( sys-libs/libselinux sys-libs/libsepol )
+ dracut_modules_biosdevname? ( sys-apps/biosdevname )
+ dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
+ sys-process/acct )
+ dracut_modules_btrfs? ( sys-fs/btrfs-progs )
+ dracut_modules_caps? ( sys-libs/libcap )
+ dracut_modules_cifs? ( net-fs/cifs-utils )
+ dracut_modules_crypt? ( sys-fs/cryptsetup )
+ dracut_modules_crypt-gpg? ( app-crypt/gnupg )
+ dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
+ 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-3.2.6-r1 )
+ 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="${CDEPEND}
+ app-text/asciidoc
+ >=dev-libs/libxslt-1.1.26
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75.2
+ "
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+ README.testsuite TODO )
+MY_LIBDIR="/usr/lib"
+
+#
+# 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
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
+ epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
+
+ if use dracut_modules_systemd; then
+ local systemdutildir="$(systemd_get_utildir)"
+ local systemdsystemunitdir="$(systemd_get_unitdir)"
+ einfo "Setting systemdutildir to ${systemdutildir} and ..."
+ sed -e "4asystemdutildir=\"${systemdutildir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
+ sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ fi
+}
+
+src_configure() {
+ local myconf="--libdir='${MY_LIBDIR}'"
+ myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+ if use dracut_modules_systemd; then
+ myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+ fi
+
+ econf ${myconf}
+}
+
+src_compile() {
+ if use optimization; then
+ ewarn "Enabling experimental optimization!"
+ tc-export CC
+ emake install/dracut-install
+ fi
+}
+
+src_install() {
+ default
+
+ local dracutlibdir="${MY_LIBDIR#/}/dracut"
+
+ echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+ insinto "${dracutlibdir}/dracut.conf.d/"
+ newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+ insinto /etc/logrotate.d
+ newins dracut.logrotate dracut
+
+ dodir /var/lib/dracut/overlay
+
+ dohtml dracut.html
+
+ #
+ # Modules
+ #
+ local module
+ modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+ # 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
+
+ if use dracut_modules_systemd; then
+ # With systemd following modules do not make sense
+ rm_module 96securityfs 98selinux
+ else
+ # Without systemd following modules do not make sense
+ rm_module 00systemd-bootchart
+ fi
+
+ # Remove S/390 modules which are not tested at all
+ rm_module 80cms 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 05busybox 97masterkey 98ecryptfs 98integrity
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_src_exists; then
+ ewarn ""
+ 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."
+ ewarn ""
+
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+ # 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 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
+ ewarn ""
+ 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 ""
+ fi
+
+ if use dracut_modules_crypt || use dracut_modules_dmraid || use \
+ dracut_modules_mdraid || use dracut_modules_lvm; then
+
+ if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
+ ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
+ ewarn "mdraid or lvm is off for default as of >=dracut-024."
+ ewarn "Use rd.auto option to turn it on."
+ fi
+ fi
+}
diff --git a/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
new file mode 100644
index 000000000000..d87565823aaf
--- /dev/null
+++ b/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
@@ -0,0 +1,41 @@
+From 41ab65b884dbe289ce62f6eb7006f636b2dba878 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 6 Jan 2013 13:35:01 +0100
+Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
+ udevaltdirs
+
+It is required for Gentoo which moves udev from / to /usr and supports
+both /lib/udev and /usr/lib/udev for compatibility with other packages.
+
+Credits go to Alexander Tsoy <alexander@tsoy.me>.
+
+Conflicts:
+ dracut-functions.sh
+---
+ dracut-functions.sh | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index cf33af5..b5eca31 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -872,6 +872,16 @@ inst_rules() {
+ inst_dir "$_target"
+ for _rule in "$@"; do
+ if [ "${_rule#/}" = "$_rule" ]; then
++ for r in ${udevaltdirs}; do
++ [[ "$r" = "${udevdir}" ]] && continue
++ if [[ -e $r/rules.d/$_rule ]]; then
++ _found="$r/rules.d/$_rule"
++ inst_rule_programs "$_found"
++ inst_rule_group_owner "$_found"
++ inst_rule_initqueue "$_found"
++ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
++ fi
++ done
+ for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
+ if [[ -e $r/$_rule ]]; then
+ _found="$r/$_rule"
+--
+1.8.3.2
+
diff --git a/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
new file mode 100644
index 000000000000..94a72d312dbe
--- /dev/null
+++ b/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
@@ -0,0 +1,30 @@
+From 342b61269a21b01844acdbb9b4396f4298e51c88 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 16 Dec 2012 20:02:48 +0100
+Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
+ use udevaltdirs
+
+To avoid need of rebuild after udev update/downgrade let udevdir= be set
+dynamically with pkg-config. Use udevaltdirs to search for rules both
+in old and new locations.
+---
+ dracut.conf.d/gentoo.conf.example | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
+index 26e7314..f9617f0 100644
+--- a/dracut.conf.d/gentoo.conf.example
++++ b/dracut.conf.d/gentoo.conf.example
+@@ -1,7 +1,8 @@
+ # /etc/dracut.conf.d/gentoo.conf
+ # dracut config file customized for Gentoo Base System release 2
+
+-udevdir=/lib/udev
++udevdir=
++udevaltdirs="/lib/udev /usr/lib/udev"
+ ro_mnt=yes
+
+ #
+--
+1.8.3.2
+