sys-kernel/dracut-010: -r4 revbump; fixes bug #373007

rd.driver.* kernel args handling patches.

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

5 files changed, 306 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index e6d82f241af0..b579c73b2366 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.24 2011/06/23 10:38:17 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.25 2011/06/30 21:23:39 aidecoe Exp $
+
+*dracut-010-r3 (30 Jun 2011)
+
+  30 Jun 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-010-r3.ebuild,
+  +files/dracut-010-rd.driver.post-fixed.patch,
+  +files/dracut-010-rd.driver.pre-and-blacklist-fix.patch:
+  rd.driver.* kernel args handling patches. Fixes bug #373007.
 
   23 Jun 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-009-r1.ebuild,
   dracut-010.ebuild, dracut-010-r1.ebuild, dracut-010-r2.ebuild:
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 6794348914be..ae2cd80f3128 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -10,6 +10,8 @@ AUX dracut-009-don-t-skip-zero-length-string-outfile.patch 950 RMD160 1cd1754242
 AUX dracut-009-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-010-empty-etc-ld.so.conf.d.patch 775 RMD160 0e8463dd1fabdfabab26861c495b769fe107714f SHA1 a35bacc2df3fd02dae30d9f397eb40c60dbc94ac SHA256 29fda5b71ae76d734b4ea5817e6601c221c15792514be2ad550413cb94725d1b
 AUX dracut-010-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
+AUX dracut-010-rd.driver.post-fixed.patch 1080 RMD160 2ab3ff1c7fef4d8d8e1fa1f5176b42e2b390fe16 SHA1 4c7ddc8dca44138c0fede8c218487aa8787547e7 SHA256 a03f0beaf47b4afde8f4945f97ae240edc1a61d71653c8c6e5120bfcbacb530b
+AUX dracut-010-rd.driver.pre-and-blacklist-fix.patch 1152 RMD160 49981662b15e9a5bdcba577acae19c4a1ad7eb11 SHA1 88b06237813c8e0a4f6266dc2d62870e67b94671 SHA256 cc4e049e02a89a5fb4d78e42dea970f11e726608aab20b4e69d35e712c106119
 DIST dracut-007.tar.bz2 99629 RMD160 5bb9d1e89e3d7b3a024369eecb594e71a359778d SHA1 38f2e74f127f682eac4dc7da30ee0ea8debfff1f SHA256 6d58778bcf24b46c82cc72c7d6f5cc1e7bac7f3f9c33aa542052583bd00d20e1
 DIST dracut-008.tar.bz2 136218 RMD160 2804a92c99539c19af54f256da2ceca34cff110a SHA1 7a3d3133ee52d824f11c9b2ccfca56fb983bda81 SHA256 f0cb0e022064c5b2fe02af9906f19ad77000d5f1813fe6cd57b037aaee921d31
 DIST dracut-009.tar.bz2 143623 RMD160 bf9126fd1310f74bf78917f8ea374ded15e7359c SHA1 4b8efde1ac7e82d740873f051309b1fc946a21c4 SHA256 791b4167f78e5c553bdd4165f4753bbe54a3662d90fc7ef695dd15c5c95f68c7
@@ -20,17 +22,18 @@ EBUILD dracut-008.ebuild 5745 RMD160 194d7b14c84d8411d49235a4359d6d2c6193cce6 SH
 EBUILD dracut-009-r1.ebuild 5926 RMD160 1ea8662b9ba97fff4cd7213edff46dd686f9c0cb SHA1 addddc776d153fbf5df75cd5297bb3543ee2c4f3 SHA256 cbc4e30d8b9836d15c3ebc7e5614122734770ef1fa370c2b90c807ae4a8b930d
 EBUILD dracut-010-r1.ebuild 5911 RMD160 37ade9087b979e2d4c96be82932cec0415125493 SHA1 827764e319155d64254fd698d63e690112c83940 SHA256 7ea5498176d284fed093d77ce93f27008fdcaa7bf2434302e7fbb234e6de14e9
 EBUILD dracut-010-r2.ebuild 5931 RMD160 9c06252c79d55c098308d541bc95c94a6890791f SHA1 9ad9906eda5850ff8b164e01c3b08ffccadffefd SHA256 cd9a1da1ced041f6ef5d560490085641f8b5daa1c6b5e4ef62ec48e4a8969871
+EBUILD dracut-010-r3.ebuild 6050 RMD160 d6bf1562f9956eee52d7d54ac6824a56401b80d5 SHA1 704d2e9f53e82e06f1b904d542b926abb565f6b1 SHA256 377c77f8795b0641c1fc076d50af21544d799f56fa65e64a5aaf4a99754213d9
 EBUILD dracut-010.ebuild 5852 RMD160 ed4739eec15783900fd9f08c93d7b68de6389040 SHA1 abe57e06520bd17595056ad810f2c5cec23a88b5 SHA256 a39d4e29a7d03fe241de6d4806535c3e5d2b6324c7de5169a93b7fd60251ed67
-MISC ChangeLog 7310 RMD160 900a9a9827ed2ad010b954bd8a33b7fecacdd0ed SHA1 46fdbf66557301988c60cdb95630135ba35c8793 SHA256 dbf3511f18bebaec3d3fd9ffd4e0166d04ce5028d2c6c500251f87898460ab27
+MISC ChangeLog 7591 RMD160 3a74431f2bacdbde59b024ac227d2588db513906 SHA1 341b52ec4eab1ec848d2d326ab4f460d7c142056 SHA256 efcadb262382963dacbb955cb661c75ab77082838a13f611e1dfb6cbfba63d01
 MISC metadata.xml 1725 RMD160 b297eb03e09381e2b03d98b37755c56f5ebe546d SHA1 145aef995db3cc66ead45189d722c7939c6d0ed7 SHA256 4a4acf6ddbe7fe41200c9bab075f677d46848b09f680a2eab05921a29455316f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOAxegAAoJEPATRTHh2/q1kLMH/RfLX7zLn5cYwN0W7XNUc8Ft
-+jOwuuZKqoaLs4kh9jYahwwf9r71lPjP/HlypyYZFunUw71WSmfXuVvaY4dP2TWw
-H8xYvtW435sG+R5UPr1f/RnMIbjJj7pWQepatTb7Dc3TR7/rRC37bldUYt6mx8V1
-018Hzqhgoo+NyKJLsukX5GRPf4mslZE3JEsPeWPpbuEHB0FAJ8qYxPMsw5Etfhz9
-+Qm6Goe2cgeC/mVSfpm/EikTdG+EDddYwzDDeDdsfI3ndE7b5xsSQMnZs9u0jl5+
-bAd5XAUes7Sly5bPWTKtHsX/7GpfDv/mAlC7nB9A5m7L2TaKJlTc6ic85TLWLpQ=
-=XdRv
+iQEcBAEBAgAGBQJODOlhAAoJEPATRTHh2/q1egcIAJ/kD7YVh86RIFVTG37Wv7U/
+DO9emHxVbYk0g+qzlTV6WENIhc7QfyjH/9cRUfnTLayCoWmUfOf+f9ZXOOPqck7R
+VjmqUgyFLsOv9YpU1LvSqVCY7QCKDtiWwuyJG8w7mrt7LBZ8eWTd7GSIBSELx5Zm
+N6G4+qVYmOdz8GwUY3Eqo4nAcdEutVR/nYpN7tuQZnk4I6bHu5I1ezxiJ0Wuj0v/
+1dGRn1sEKAVnYUZMbZFtBrXd5DlluAhGxyV7vivHbUJfy00N6BZE93rsAt2Ktu9i
+9pvFp5BLND2a9xEU/4KUbDNxiEfeTQxyg/o0uMjYOOPIwHR0DPTIbOkgtr620Ls=
+=J0OQ
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-010-r3.ebuild b/sys-kernel/dracut/dracut-010-r3.ebuild
new file mode 100644
index 000000000000..ae5e2df40fdb
--- /dev/null
+++ b/sys-kernel/dracut/dracut-010-r3.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-010-r3.ebuild,v 1.1 2011/06/30 21:23:39 aidecoe Exp $
+
+EAPI=2
+
+inherit eutils
+
+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="~x86 ~amd64"
+
+COMMON_MODULES="
+	dracut_modules_biosdevname
+	dracut_modules_btrfs
+	dracut_modules_caps
+	dracut_modules_gensplash
+	dracut_modules_mdraid
+	dracut_modules_multipath
+	dracut_modules_plymouth
+	dracut_modules_syslog
+	dracut_modules_xen
+	"
+NETWORK_MODULES="
+	dracut_modules_iscsi
+	dracut_modules_nbd
+	dracut_modules_nfs
+	"
+DM_MODULES="
+	dracut_modules_crypt
+	dracut_modules_dmraid
+	dracut_modules_dmsquash-live
+	dracut_modules_lvm
+	"
+IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
+IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
+RESTRICT="test"
+
+NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2
+	net-misc/ifenslave"
+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/baselayout-1.12.14-r1
+	>=sys-apps/module-init-tools-3.5
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.16
+	>=sys-fs/udev-149
+
+	debug? ( dev-util/strace )
+	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 ${DM_DEPS} )
+	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
+	dracut_modules_dmsquash-live? ( virtual/eject ${DM_DEPS} )
+	dracut_modules_gensplash? ( media-gfx/splashutils )
+	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ${NETWORK_DEPS} )
+	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 ${NETWORK_DEPS} )
+	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
+	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
+	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
+	dracut_modules_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}-empty-etc-ld.so.conf.d.patch"
+	epatch "${FILESDIR}/${P}-rd.driver.post-fixed.patch"
+	epatch "${FILESDIR}/${P}-rd.driver.pre-and-blacklist-fix.patch"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0 || die "emake failed"
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
+		install || die "emake install failed"
+
+	local gen2conf
+
+	dodir /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README* || die 'dodoc failed'
+
+	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} \
+		|| die 'gen2conf ins failed'
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut || die 'dracut.logrotate ins failed'
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/share/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 ${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
+
+	! any_module ${DM_MODULES} && rm_module 90dm
+	! any_module ${NETWORK_MODULES} && rm_module 45ifcfg 40network
+
+	# 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 00bootchart 05busybox # broken
+	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 dracut.kernel(7).'
+	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.'
+	echo
+	elog 'Options (documented in dracut.kernel(7)) have new format since'
+	elog 'version 008. Old format is preserved, but will be removed in future.'
+	elog 'Please migrate to the new one.'
+}
diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch
new file mode 100644
index 000000000000..3a036d7655d8
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch
@@ -0,0 +1,36 @@
+From 969a4a6b82cfe36fada9c3813ef81cb3641863af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Thu, 30 Jun 2011 22:43:34 +0200
+Subject: [PATCH 2/2] 90kernel-modules: fixed handling rd.driver.post=
+
+Conflicts:
+
+	modules.d/90kernel-modules/insmodpost.sh
+---
+ modules.d/90kernel-modules/insmodpost.sh |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh
+index c3d7714..168a907 100755
+--- a/modules.d/90kernel-modules/insmodpost.sh
++++ b/modules.d/90kernel-modules/insmodpost.sh
+@@ -2,11 +2,13 @@
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+ 
+-for p in $(getargs rd.driver.post rdinsmodpost=); do 
++. /lib/dracut-lib.sh
++
++for modlist in $(getargs rd.driver.post rdinsmodpost=); do
+     (
+         IFS=,
+-        for p in $i; do 
+-            modprobe $p
++        for m in $modlist; do
++            modprobe $m
+         done
+     )
+ done
+-- 
+1.7.5.3
+
diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch
new file mode 100644
index 000000000000..58d4287e5309
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch
@@ -0,0 +1,35 @@
+From ce09d0ea4ddf01076453de6dde6f86cf6f12113d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 6 May 2011 12:06:20 +0200
+Subject: [PATCH 1/2] parse-kernel.sh: wrong index was used in for loop
+
+Thanks Mike Snitzer <msnitzer@redhat.com>
+---
+ modules.d/90kernel-modules/parse-kernel.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh
+index fceccaa..9323d42 100755
+--- a/modules.d/90kernel-modules/parse-kernel.sh
++++ b/modules.d/90kernel-modules/parse-kernel.sh
+@@ -2,7 +2,7 @@
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+ 
+-for p in $(getargs rd.driver.pre rdloaddriver=); do 
++for i in $(getargs rd.driver.pre rdloaddriver=); do 
+     ( 
+         IFS=,
+         for p in $i; do 
+@@ -11,7 +11,7 @@ for p in $(getargs rd.driver.pre rdloaddriver=); do
+     )
+ done
+ 
+-for p in $(getargs rd.driver.blacklist rdblacklist=); do 
++for i in $(getargs rd.driver.blacklist rdblacklist=); do 
+     (
+         IFS=,
+         for p in $i; do 
+-- 
+1.7.5.3
+