Version bump.

NEWS
~~~~
- new dracut option "--device"
- new dracut kernel command line options "rd.auto"
- new dracut kernel command line options "rd.noverifyssl"
- new dracut option "--kernel-cmdline" and "kernel_cmdline" option for
default parameters
- fixes for systemd and crypto
- fix for kexec in shutdown, if not included in initramfs
- create the initramfs non-world readable
- prelink/preunlink in the initramfs
- strip binaries in the initramfs by default now
- various FIPS fixes
- various dracut-install fixes

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xE1DBFAB5

3 files changed, 304 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 470611aa65e4..823e49427490 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,26 @@
 # 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.89 2012/10/27 17:43:02 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.90 2012/10/28 11:24:44 aidecoe Exp $
+
+*dracut-024 (28 Oct 2012)
+
+  28 Oct 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-024.ebuild:
+  Version bump.
+
+  NEWS
+  ~~~~
+  - new dracut option "--device"
+  - new dracut kernel command line options "rd.auto"
+  - new dracut kernel command line options "rd.noverifyssl"
+  - new dracut option "--kernel-cmdline" and "kernel_cmdline" option for
+    default parameters
+  - fixes for systemd and crypto
+  - fix for kexec in shutdown, if not included in initramfs
+  - create the initramfs non-world readable
+  - prelink/preunlink in the initramfs
+  - strip binaries in the initramfs by default now
+  - various FIPS fixes
+  - various dracut-install fixes
 
 *dracut-023-r2 (27 Oct 2012)
 *dracut-022-r6 (27 Oct 2012)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 99a8b494e17a..d50ff8c3c703 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -36,21 +36,23 @@ DIST dracut-018.tar.bz2 189067 SHA256 3ebc0e9c9df24802dd4061aea6907670453fc86525
 DIST dracut-019.tar.bz2 199187 SHA256 a68f00f896aef1cdebc8479f522d6a10b9d20b7dfcdaca85168d54dcf3891da7 SHA512 543cfb1c2079d6a5525d28c2738933aa5ad046a184ba80cf6c82f8aebac031d1f6e3c0f489ce94bc013f707b4dcd756228b03f4e6f7a8752d438a043b18bbbb0 WHIRLPOOL 627d972a31cda9d36d7a577aa10802d7ddf9e95e5ac7128e306a3b487241cdbbfaf3771a63b70810577f41dc776d9a6a698215af37a038095bc0b10aea9e6970
 DIST dracut-022.tar.bz2 243314 SHA256 32f574efb0a48a2ee6e1967f8b410b241f93bc9eea9bd0b90437be5e9aa028e5 SHA512 43906e147270a548ef6c98539fd36ac7e89a0ca88de600dbffe02d7b03a2acf6347ae4951557b3af0101594fab100a112cb57b7d6a1490dbaa6ddc9156c0a88a WHIRLPOOL 17d0d4dafb6c399b61845655e7b25b513f636b1ee152fe4373036dfa34c46f8d4f5016d5f74350112483b81911dfca751a15eb15a963ad2f4066840a8c9b80d2
 DIST dracut-023.tar.bz2 238823 SHA256 6899cbf0c32f0d8ec1c420a4b6b3fd348b30fe3f4d557783ec40de1e8da26239 SHA512 abd5b165e67cf7298ef0ba8352de924232bdeb7390917f5fbd98a7a2a10b01fe1b3e35f8b619154ce21e5a90b3f9cb07a6fae9e4d8f017b9d7696d15ae46f11f WHIRLPOOL b50b309f4d128d785e62f21c084f4a79100aed0570127376643626e84d9d019b2c5bc32ff14aecec23fbb929456ac51d0a334a1aee275bafc6e4135e80a03789
+DIST dracut-024.tar.bz2 241264 SHA256 c0f5a905a838772246246b960050307211177c7d113664bba8d306b83e23c6da SHA512 2eaea3ce2d7ea777491d7798a99764278c7c2b7a70be8b7050ca264e5debeeca2c9309acf56cb497f5d806c41f992fb8b77fbb6a837c8318d9e1e9413f3af199 WHIRLPOOL a03d947e4368f1edac01628bdc8ca81c0a9aadebf493c1dc46d1d7618ecdb55307a8fb762c36e260191759eb794a4b029537b2bb9795188b158a66a4f029b3fd
 EBUILD dracut-014-r3.ebuild 5255 SHA256 1138f064ea8d1c36b5caa8db16d9f762c9050f987c4c828bcbe04c106a4e8643 SHA512 52bffe608413a10d130fc3bf29e5e3e043af3f903b8e7be58da4b43b411695b47d4bd3bb7ead907c1b87bc3248ffac6288e785dd28a069bc833e2c6bacb0e322 WHIRLPOOL 472b7bb9ebf0d9042fd7733ea0e82294f8ec661a06d249e3765f6ae231adf09e133cf7290c0cfb8615bc1b5f7ebce51f4320d476c9d8b4ff10114683b3c941ae
 EBUILD dracut-018-r3.ebuild 6894 SHA256 1fd0893281ac2d3343310f0d23e35f22eea6102be2ec79477b2b6f1200f2ebc6 SHA512 68b91ba171a7027010b7c378f7afd2e00592a07469baa0208619ff14707b46888f0285543d4cb15ed58fc9f04d4d9640b66711a84df52ec8b1527542b4c8abcc WHIRLPOOL 9a38071095a852a499d9450b87a479d479f6428133d80b382ad8635db2a0789ba5851b4550b70d92660bb482287bb4d84c0fe9ddcf03ad2e7571f1a2f0d0b0d8
 EBUILD dracut-019-r6.ebuild 7083 SHA256 e3a9596fcf4c880163b8aa6ce558f22af5cff38f30db9911babb8d4f7ae073b2 SHA512 17911d02f571475b931a1379039561673aa8649af1920254b059c1733ea1315d6c4bde175610d81b9fffe3de877a847498a2a6dee6f74d09bbad0606d3c2a9fe WHIRLPOOL 631415f0822df0a8011d2e3ee741c914972df284a2a9d884cc10bc3810acd02392c1d48e39d9af042a6aa4bad65d39e5965bb99bd7d3b35693b711c3057b91b4
 EBUILD dracut-022-r6.ebuild 8515 SHA256 84d78dc58227147667d422872301a013bfa17c56aa35611691149daf660aa1bc SHA512 6805c94f4fd7fbfed5692a1a049c9e34e248081f0d8e2ecf51809ff31d73d598bcc93c6db4bc2ab7e30dc8d21d81a4d4a093609b8ba80212595215b6cd74e468 WHIRLPOOL df9ef4c0b2f22d0a7ec0963c3a2ca9a3f3b9d20eb0382062b3b0b8406ac485668b9705b70f66cf384aebb0c04b9ec14d5acf232da647af8ab4d006882b2976d0
 EBUILD dracut-023-r2.ebuild 8111 SHA256 0ae33590563eb3ea2669e22c2445923c5621365ebcc364b1d697fe40081368cf SHA512 0536caf107f4d8cba298a289a32c4b8af7b7ac5212e94c18c8a83bca32a91384b530057f1422e438abc645b35a152012bb0c9f6a3d3fddabcedaa5f04dca8893 WHIRLPOOL 065e9d6a50d82320bedfd13797a47cc545f3eed06c0271527e1caaec74b0d15e950c7c832725ac8d6ef6d31b39cc1661fb4928bf56301ddac5e472275ad5e294
-MISC ChangeLog 33691 SHA256 f2a518ee1b4891aaf8cd48c85ed8b4d6db2c07587a7a1ab0eb080fabd9e9901f SHA512 a17a50711e66c490a33943e34c88b3d16d7c1810074122dc162b504536a68214aa5f33de0fe8fefc80b46907f4f1c41d05945119a1fa0c87441d3f33ef39c33d WHIRLPOOL 51137e503a47717e0231a653af22b03701b0456c2e5fd4232a3e9cb691450b7a17992afa3f65f71c8a2e4df58042f0ee733638f732a35127e342961fa14a0935
+EBUILD dracut-024.ebuild 7951 SHA256 d7d29322a26b336979dc736ad18b36a2745711026ada5aea34887ce303fb5deb SHA512 467bc245ebbd2b89a1e8b2b26c52044275aa20ceec43f0350d4585b9b4507f4683bffb66c35c65124ea820968b16d645777dbd00638b5e254301a448536a7abd WHIRLPOOL 79168dc9f7ebb7fca352bee70c374a1f69a00d184fb26c3dcaba3272770fc2253c982a1d989049e9bae77b033c68c5a536899b909ce6468662c241ef20a52f6d
+MISC ChangeLog 34352 SHA256 09fc0d2c9a1c01b2c3b48979e69e9ca7fc46e25d135c31b775c7687adf3b5fd8 SHA512 65bee3eaa6bd3b0190b5af49223c4c2f98d48997b599e50839048924f14a2887ca7b8eb7fefdd6ad54cd088a3ec36a51c3af5aca3da7e221c85ff3152d36faa9 WHIRLPOOL b4ae0a3cf2ab63db80d48ff5e3f2f59631e7bcac7e9f98fed8f617e8eeef508a4dfd12e941c014d0da8a3c4f0359cd33e9fbbaba5eba22689dfc0b011c3f15bf
 MISC metadata.xml 926 SHA256 b895115d72a686208816e1042bd295abb183ea832cdda73859deb690c11b932c SHA512 e6695bc301c6b3621e1730bc8e6ecc6c317705037a3004aab36bfea0b7f6a8b235a6d61ec4e4b9bb234ea53971d6c18dfbd0d09b3f30080a07eeb9e57da98c96 WHIRLPOOL d844828523e7bb0805b4b3d64d72163702adb6d4bedf7929494208e50696e43ddddc1e4a262c663ec98e05b65037868454135c0a46f82fb6b455e692826b48dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQjB0tAAoJEPATRTHh2/q1ThQH/0yn5rda8T/urOKO2as9Sg/2
-IoBvwa2Wdyqr8r832525NUmptWRaoWd+YQs57mdKLC996uQ2BwMR91NEBPQbBFul
-VvsLy1MNhcQ3bCTvRADYCVcPZNnjfCX+RIYmrQse7KGM+nSRpDCHzOwwV+2721bg
-0fNOgr9GQB2NjZENBaT5yAnPa56T03MEnB5Go5aF6jZ0iMag+GOFc7MZQl1DsBsE
-v3KXCdB0YDEQBrMpNckM706a7lDRKd77tObYcgjel/yq0LXi60AuJjsEv4qj8yrP
-NMy3PvIIlFThDBJ0/n39IRcTwOgdod+kgs/9B7RiWKT9NWRaAJxxW9GgXucXPqU=
-=RBtg
+iQEcBAEBCAAGBQJQjRYBAAoJEPATRTHh2/q1BMUH/0Lx/GM4xO14O2t3bxpEyyOc
+4n+UJ17gAGnaQrHcUEp9L/92gwMs2D4KqnmcDaAwaicSVg9IwNKL3KtA9er0w9m6
+gpoMYioERttgP3YVZ0T+NC7fxNEOs//Jl51hKdR377pfTOf19ZNQ/zcxVPea4Ifh
+fOTd8RdyseWgv+yRNpW1+uqTJCpfP58dlFvwNfCiL2aglCCAc4eWb5JZvZwEOVjN
+0t2LEyHsGvGeEjdUwkxgXE9ql86/uRREpQTgtmcJQjcZqLsj4Jc4a8Yz/wtGQHz5
+DLR274hUMbOUP8dVnYh0W+ZzgHMfdqn194bUes1LOzxoeA2U5J2fTXKin7jQVQI=
+=oTPY
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-024.ebuild b/sys-kernel/dracut/dracut-024.ebuild
new file mode 100644
index 000000000000..323725bcca9d
--- /dev/null
+++ b/sys-kernel/dracut/dracut-024.ebuild
@@ -0,0 +1,273 @@
+# 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-024.ebuild,v 1.1 2012/10/28 11:24:44 aidecoe Exp $
+
+EAPI=4
+
+inherit eutils linux-info toolchain-funcs
+
+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_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_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=">sys-fs/udev-166
+	dracut_modules_systemd? ( sys-apps/systemd )
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>=app-shells/dash-0.5.4.11
+	>=sys-apps/baselayout-1.12.14-r1
+	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.21
+
+	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[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_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="${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
+	virtual/pkgconfig
+	"
+
+#
+# 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() {
+	local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)"
+	[[ ${udevdir} ]] || die "Couldn't detect udevdir"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -e "s@udevdir=.*@udevdir=\"${udevdir}\"@" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use dracut_modules_systemd; then
+		local systemdutildir="$($(tc-getPKG_CONFIG) systemd \
+			--variable=systemdutildir)"
+		local systemdsystemunitdir="$($(tc-getPKG_CONFIG) systemd \
+			--variable=systemdsystemunitdir)"
+		[[ ${systemdutildir} ]] || die "Couldn't detect systemdutildir"
+		[[ ${systemdsystemunitdir} ]] \
+			|| die "Couldn't detect systemdsystemunitdir"
+		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_compile() {
+	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc
+	if use optimization; then
+		ewarn "Enabling experimental optimization!"
+		tc-export CC
+		emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install/dracut-install
+	fi
+}
+
+src_install() {
+	local libdir="/usr/lib"
+
+	emake prefix=/usr libdir="${libdir}" sysconfdir=/etc \
+		DESTDIR="${D}" install
+
+	dodir /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README*
+
+	insinto /etc/dracut.conf.d
+	newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dohtml dracut.html
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D%/}/${libdir#/}/dracut/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
+
+	# 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 ~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
+		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 "  CONFIG_MODULES"
+		ewarn ""
+	fi
+}