Fix lsinitrd failure to detect version and modules - bug #533112.

Thanks to poncho <poncho@spahan.ch> and Jeroen Roovers <jer@gentoo.org> for
patch.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

4 files changed, 337 insertions, 6 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index b7e6b9e4856a..0fa8f901bcf1 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/dracut
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.182 2014/12/19 17:31:07 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.183 2015/01/11 14:20:14 aidecoe Exp $
+
+*dracut-040-r3 (11 Jan 2015)
+
+  11 Jan 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-040-r3.ebuild,
+  +files/040-0007-Take-into-account-lib64-dirs-when-dete.patch:
+  Fix lsinitrd failure to detect version and modules - bug #533112.
+
+  Thanks to poncho <poncho@spahan.ch> and Jeroen Roovers <jer@gentoo.org> for
+  patch.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> dracut-034-r4.ebuild,
   dracut-036-r4.ebuild, dracut-037-r3.ebuild, dracut-038-r2.ebuild,
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index b1846d613ceb..45210a43f381 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -41,6 +41,7 @@ AUX 040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 1db2096f0a
 AUX 040-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 aaf07b481d99ca43e3b692fde96c78cdad3785a0507bf39a9b7db5667ad39e46 SHA512 695577921cbf0d3629dfaee0c5a55fb525a937453d16ca04ebfd7de0bad053f7f956300c443d2d47a2461ac2f48da86d2b3d9e0345bc50e94c608c8d2de13aef WHIRLPOOL 2f49074529b8fab63bbfafe17cc6af13320ea51b5609e4ca8fd6d1bd26d8da53dc0a4222b09dccf1766bf509d141bb781fb9368e9cd99f2ee22bc23b6ee543bb
 AUX 040-0005-NEWS-add-040-entry.patch 525 SHA256 8ede46792c1df587a45f5635661e1eddcd4819254e551aeb0a3da6a161258407 SHA512 0c23ab050653a6bc9ea8188b674bdbf2cc649530cc956e4731263c78fd2f29007806e9152e157f08d348750469dfe489f025087156a53b27905d85246046e27e WHIRLPOOL 9442ef0610c0f9f0ed0a0c72ae8fe3961c5c9a12a8ae1ce9837b66190b3418c70bb73f1dd5e0f78f0a9b8ceaefcdf59c6442897cc0e78040406b37597a702aea
 AUX 040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch 913 SHA256 7aec938b001d483b8f8a11eab2e165bbf52de1128ec0e196d4a8bf474d3cc4ba SHA512 60e117f8594275911addddc530edebca83a9585c4c7abeb8f3cc03bde16781e961f5194f97335efae3411fb53777bfc6db3921823272c95c34f338cff1be538e WHIRLPOOL a469a2461aea8cd9d459100102ebbf908084945e568ebe3fd78ca7a4730825e31f7286c58bb65adee0c7158d39a5b9064c51dea72ed11bc89470712560c529c7
+AUX 040-0007-Take-into-account-lib64-dirs-when-dete.patch 1877 SHA256 df68184338dd092f01a42064ed7fcdb78e46f348027ff55cb15169c88d0e94f2 SHA512 5f2669addca7b70566213a066a12ba101273611244c3b190c8efca184a0fc50a3afc05bb08bedb998aa387e68abb034cd8fcf914013b2cb99efc9aab6924aed0 WHIRLPOOL b5475357f89e142519db4dd1d3fc8dc2f5a526926e58609a54b9358983a02ce2d04086468f0aca8ae3a930ecef5187c39b8fa0ea9443803e555fa46693173861
 DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362cc93a78c5be28ffd7c794a331f992498e451d69c1830f054fa SHA512 e5e41b8696716c5284ea981ae85dbe688c5c31330e400c79f4ba46890939dffdd7744e4a85d27d074987a8db65114332171af0a5471338e3e4bed19d54edc6fd WHIRLPOOL c5d29ef2f20aa752e57180be35a2014c214a25e4e49d3f623d05cd6ef1debd2cec38d24453ecb0c004cdbb52239f0d541ddc9df065ab84fb7d62c30594704347
 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13
 DIST dracut-036.tar.xz 255192 SHA256 6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b3528793ef117820049b6fcd3 SHA512 e55448701ef4b0c8969d4d64239a2a7df3d7b06f4457838d2b2139e58b754822654a1b8cfc7d6dbcd7a79dbc14e75366a39e21104b4aeda20c7bf34734668344 WHIRLPOOL ddbe88cb6b333586a71eeed98871066bc79208d2ba8d88dfb42245aca6bd15d6c0c436948569fc8c18703f9d66ad9918bb1e73e050ce6c807fae833148ead218
@@ -53,13 +54,18 @@ EBUILD dracut-037-r3.ebuild 7987 SHA256 7d724cd7d3927a43246316414a65b440af711ba4
 EBUILD dracut-038-r2.ebuild 7926 SHA256 6e4ad5ac958f722a6484f36a2bbd33359bf4f055d5c81c1dad16e575102b7974 SHA512 988688cd14946e719bbf3677abb7782c79a36edbc707a3f2c56e902b102da9840e13ed2d2a52b02d4ecff2cceb88b84f58d4c69633c249665dca9898babbfca2 WHIRLPOOL 8050c36b85d4705d19bac482a403924a1fff99eed85ad10f32a89e8b7cb1ba7db1a8acfdae4bb7b2834925a88d95601f376d60b8ff67237b54f1d64ddde0952a
 EBUILD dracut-040-r1.ebuild 7917 SHA256 d6efb3a4fc5d31a05791ca00692515f4ccde57d76213ddc478afa10a9ba8f037 SHA512 c0a9500d3388bb2ee34825850978cd3354e8318ff999182c14875e8732ca97157b5eb0b36b56c611d28501784074f6ef48b1cf8903600fcb90b56873377b44f2 WHIRLPOOL 41321feb577b8ca75034989a2b3345e21ece7972c859537699be22a56295780c5c7474c8921c1d55f0a9164eb5a8c9402ec942a88b442b234c783dc0807a6c01
 EBUILD dracut-040-r2.ebuild 7925 SHA256 70525b9785a16f408f41e35c8e1bd544fb0a6002b72878fc87f8ab10a6bb9418 SHA512 b6b9aac944574fefd3609c36abf382478981136c855bdc46be5eb1ac08ca450e8404cf81dc2c214be41c2deacf8b5bdf54281e2538baee4485adfc603e3de907 WHIRLPOOL c238ab3f7197efc19fbc7a77308f19d91df104ce8b46805cdfb8244ec731e0fa3a179d4f9aeec1922b1612bc00315bafca7bf2d4a41a3894fb5b59da382cbe06
+EBUILD dracut-040-r3.ebuild 7998 SHA256 b9201824939326f805e9be6257b48ccf4d3d896364d4084a07f2d978c74d9255 SHA512 eaf85f05d3f63e50ab4e5d4ca7140dd96cb029ff789dbec5fca6ff557713be7bd187c445543cca53b7ba2bf15f12d808c5390f8dd8c1c199cbcbd6b065b7e887 WHIRLPOOL 854a55cb81b5b5f33573fe14fd32c0ef4fbe189bf4339bf9155824ffcd726f0aad74d3071dcb9a11fbe863ed7435b448870bd0b13b2f06e6c2575b387156836e
 EBUILD dracut-040.ebuild 7896 SHA256 59c0b78bd5038178e49ab16be4cd0fd3cb6306551916a3cb91570c9c89aafdd7 SHA512 f85a7767dbbbaeae743c79a78646396d2ec45414ba3b24a2bb1db6e9847da3dcd6e7ac725e92e78f005916f3473ce475df769ac9ed19df69992984eb32ade608 WHIRLPOOL 221b2bcc73a5fecfa88181b9a89db604145ce4ab5e1d04d843a10367667a1435b23c3def9af2088d174eb202e548101537a4ec4cd3a5f4afa441d63b05511c27
-MISC ChangeLog 77295 SHA256 b81b3aca58934046143a0f8f62a6e4bf5c1c744c75ae41acc669b93b645d8f59 SHA512 49309beb2ab04b4acf3a10e00b089a79ea96847be24ea7349313feedf5ca953ce17cb3e9bf5cd92689388f2cdff4d4d724a044bc945b9d06fb547bc6b786a838 WHIRLPOOL a206607a024c85a3fd91d4bcd932d94921823e4f7541074b1cb49ade39a991f92898e709803339eb2abf0e1bd176be77f3cd849fc487576114f47ae7eab8c405
+MISC ChangeLog 77628 SHA256 c8c8054fa760cc5d8c85cead6d8470856b0329184771b394a90352dd924ef2de SHA512 2f7df00fd3c0b0db773e6e7ec6d1774ec671c38d1bcebc7c07908c61c8707af1fa2168a9ded809d6c6d935ad3b4135f6d879dfcb7fe50b3574cbf39680b8df61 WHIRLPOOL 90e32c4255fc3b8d5a9ddba112c329d90de27ab6f9dab00e24fa42997c4746ed0ef4cf3f019e45ac74650f0aa2fd788ef3f731e92a3cf16521af51166c9f4d71
 MISC metadata.xml 906 SHA256 5f19b725d0669877fdd7814634b7aa7dd73331459bace52de02908417b833c3f SHA512 c5838d36080528d541b67cb38de17cc2351f7e5e17ab060c58f037792225ea223ade6b7e69376f4a9256b0bb3dcf4de578dcd50ee1c7d04a3f3288ca3c1ada43 WHIRLPOOL 532ea421fab965094820d5c0961a00ca38c858461f572a0cd4a145aa90340a569ee942062338ae03773c2709a08e4882f3176333aa5383b7e3c467cb01c0874d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUYNwACgkQCaWpQKGI+9QAKACfdLvZcK/iv72Ap6ke+CR1F22y
-KLEAn2gkBQm1qc1mne4GlaxERzKAZTuw
-=Z0Qx
+iQEcBAEBCAAGBQJUsoafAAoJEPATRTHh2/q1OM0H/2lcR4Pmm2PkRseTd2nuNAIG
+xfbDLvvYg8qd7eucK821Qssbbhr3Xgpiz5jTA8i6QlMpKG0XQ6vItsukgmoyZyOt
+DjI7eU3xablinX+29SVmDZrICK49CsIJBo9g/A/TLettrkK7bqRlXsSQ7RMHMOUz
+KhjqMQh002guUqaoDITAXug9ZI+BCxHTpM+aOxPsN0cN7DKypmflmdESHC5270B5
+1z8VfUBHeiMj0YP9uOPlN0IN3OTZ0CFmGLp1kGEtr9Wz+8/jYwDhUkexBV3A7N8/
+E1duklpHYuZJOgPdlHggJVvzfm4WKYcyCsVMZn3oT1oEEQPKv5R6mhh+n5ea4Jc=
+=9Qtd
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-040-r3.ebuild b/sys-kernel/dracut/dracut-040-r3.ebuild
new file mode 100644
index 000000000000..14a3a02b144b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-040-r3.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-040-r3.ebuild,v 1.1 2015/01/11 14:20:14 aidecoe Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	systemd? ( >=sys-apps/systemd-199 )
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>sys-apps/kmod-5[tools]
+	|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils )
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsepol
+		sec-policy/selinux-dracut
+	)
+	"
+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
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
+	"${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
+	"${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch"
+	"${FILESDIR}/${PV}-0005-NEWS-add-040-entry.patch"
+	"${FILESDIR}/${PV}-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch"
+	"${FILESDIR}/${PV}-0007-Take-into-account-lib64-dirs-when-dete.patch"
+	)
+QA_MULTILIB_PATHS="
+	usr/lib/dracut/dracut-install
+	usr/lib/dracut/skipcpio
+	"
+
+#
+# Helper functions
+#
+
+# 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
+}
+
+# Grabbed from net-misc/netctl ebuild.
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 to ${desc}"
+		else
+			elog "  [ ] $1 to ${desc}"
+		fi
+		shift
+	done
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	if [[ ${SYMLINK_LIB} = yes ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	fi
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	sed -e "3alibdirs=\"${libdirs}\"" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use systemd; then
+		local systemdutildir="$(systemd_get_utildir)"
+		local systemdsystemunitdir="$(systemd_get_unitdir)"
+		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+			--variable=systemdsystemconfdir)"
+		[[ ${systemdsystemconfdir} ]] \
+			|| systemdsystemconfdir=/etc/systemd/system
+		einfo "Setting systemdutildir to ${systemdutildir} and ..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	else
+		local systemdutildir="/lib/systemd"
+		einfo "Setting systemdutildir for standalone udev to" \
+			"${systemdutildir}..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--libdir=${MY_LIBDIR}"
+	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+	if use systemd; then
+		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+	emake doc install/dracut-install skipcpio/skipcpio
+}
+
+src_install() {
+	default
+
+	local my_libdir="${MY_LIBDIR}"
+	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"
+
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	if use systemd; then
+		# With systemd following modules do not make sense
+		rm_module 96securityfs 97masterkey 98integrity
+	else
+		rm_module 98systemd
+		# Without systemd following modules do not make sense
+		rm_module 00systemd-bootchart
+	fi
+
+	# 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
+}
+
+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
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		sys-fs/cryptsetup
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch
new file mode 100644
index 000000000000..5d1031284611
--- /dev/null
+++ b/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch
@@ -0,0 +1,44 @@
+From 25efd305dace3275c661e0a7dfbaef42b4cbc6d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 11 Jan 2015 15:10:39 +0100
+Subject: [PATCH 7/7] Take into account lib64 dirs when detecting version,
+ modules and params
+
+---
+ lsinitrd.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lsinitrd.sh b/lsinitrd.sh
+index 4f12c2c..dc1f88f 100755
+--- a/lsinitrd.sh
++++ b/lsinitrd.sh
+@@ -124,7 +124,7 @@ extract_files()
+ list_modules()
+ {
+     echo "dracut modules:"
+-    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
++    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
+     ((ret+=$?))
+ }
+ 
+@@ -217,7 +217,7 @@ ret=0
+ if (( ${#filenames[@]} > 0 )); then
+     extract_files
+ else
+-    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
++    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
+     ((ret+=$?))
+     echo "Version: $version"
+     echo
+@@ -226,7 +226,7 @@ else
+         echo "========================================================================"
+     else
+         echo -n "Arguments: "
+-        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
++        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
+         echo
+         list_modules
+         list_files
+-- 
+2.2.1
+