Bug-fix in zfcp and lvm installation scripts.

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

4 files changed, 321 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 90dd746e0ec1..57739312ebbc 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,12 @@
 # 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.170 2014/07/18 07:56:01 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.171 2014/07/21 08:00:22 aidecoe Exp $
+
+*dracut-038-r1 (21 Jul 2014)
+
+  21 Jul 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-038-r1.ebuild,
+  +files/038-0006-inst_simple-doesn-t-take-H-parameter.patch:
+  Bug-fix in zfcp and lvm installation scripts.
 
   18 Jul 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-037.ebuild,
   -dracut-037-r1.ebuild, -dracut-037-r2.ebuild:
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index aa66df05172d..54dc18cb3829 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -34,6 +34,7 @@ AUX 038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 8ca9d11d063
 AUX 038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 ddb9df60e10a454a54322bb85153edf819c5d1df6a66517008ac57cc0be543fd SHA512 ed02a712da984f8c0b7bc036d2a6f281714e4679a93195c8ee90a4202d9a514c468c5de26dd31683ea5194357b6abe7182e3d722beaca280c2dd8bdc402a8630 WHIRLPOOL 9c36a1d665c7c217f78715d58b2b87f36cc6143f5d6f226d73b7d2fe941670d0684b5aa3282e76ee831edc53a64385e631218acc7136474e99b0248a2825bd24
 AUX 038-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 837b4ed184742b592eb6bd156890d9cbba4b6b9e3e36c0f943c89509e5e1e405 SHA512 f2303b1c57c8ab4e39bf759151cc44fcfe9aaccb8aa123704078c49bceff6aef7b2eb2f567f7295fe0db89ccfa78f087422d6e65433dd25347e82945a391a689 WHIRLPOOL 0b03b7569df09884660b415370d6085062f53a7ee7f673423ddb797c73d9bc5ffbfa1503374b1c0aa428cda3715b50a12a8e932d9e30ed5a299bd13d090837eb
 AUX 038-0005-modsign-do-not-hardcode-path-to-keyctl.patch 784 SHA256 85867e0aa30d6137ed4585cf88e5a7816b338a8d37d27f716593f2ccfd9cc751 SHA512 fb20595b531373b9d481b5ece1dc2abac7eec2633891507974051d95c79b55fcd6ef9931fd5e924c7ace52cfc50b62a8ee0516980d69766cdd5a1bfaac2733c2 WHIRLPOOL 4778ceefd135680c58ae14a7350eb886dcecb9133607d66ec12ce314d3ffef68972b7e6fa7b3ffbacd76825ecd75f83926a001df713210c5abcbb4f4ae115f3c
+AUX 038-0006-inst_simple-doesn-t-take-H-parameter.patch 1478 SHA256 ebff899fb89677db767dec09d00a8e613dd77ccff45a365a01c3e6171e7de451 SHA512 bbe5d877fbf1077c4d0a5e2cfc170a985aa516e571ac16f528817a6c5f255c045ee356d6deb05547bee31be19225c087b7f6143b0478f5ae93f4432ac9a20bb4 WHIRLPOOL f2a16ff105662b9a6c1b153a075f2e5fb690e75cc86daf61ddeecb5bf04c5679b732de486de6653d2722fad4e42032096256a2da2eb1b9f90518e70d12a34270
 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
@@ -42,17 +43,18 @@ DIST dracut-038.tar.xz 259128 SHA256 3b0d4466ff5bb627fcc783f02a757187195567b97bd
 EBUILD dracut-034-r4.ebuild 10416 SHA256 79ce6e1d4d6a5ee546309b518e8b92446d3da60c13435929f70c8b54db816d69 SHA512 6a2903b1960dd486ef20c483f8ed8b4ca1430362ffabe07dfad6c2b854164ddc91daf0ba119c6011a432a6bb300fda708d09ca89328073d72bb625b405966cae WHIRLPOOL 077a09b1578a790762d8444ce1a6560f61a1acbcf1520c44ae139d04ae34f3322676178d51a2b9a1462868d3e0f1eea1254869f64810272951c90f4347d57cd9
 EBUILD dracut-036-r4.ebuild 7723 SHA256 8a1165848519c870ed145b6554bc679fe1d9cb19a62df1111255b229246c2391 SHA512 97c0be10312ff68ebfce3f17dbfa02e5b3b4fcb51acdab6362e6329d2b93f60f87d81bb10f00377aa372d9b1b9783c705f8ce3187248a6e76571e143ed3c326d WHIRLPOOL 07044379e3a84318a672a8e7c84b4266bdc437030bdc7756726ea9260c6565f5b3159643ec488874adf530b7c8e2868b81691fafba49bbe79087936cdfa110fc
 EBUILD dracut-037-r3.ebuild 7957 SHA256 e0e9a52924d423202d2393a42a68eb31c3d488c8b4bb48b50b3727a30e796106 SHA512 579b1fe807bd3d48b2a7c315a86de930065045351ab28f60f12810d02711ffd26152d5c734f695e4b2ad00c2c065ae4ce81312d28441e51933ee1993ba94ef2d WHIRLPOOL 316d2ad8ef6b251d9b3e1e5536d1d737946651118bed25cdb0c3840e2102fa208f7a721a7fa9af939b8510f9ee933435fd54a679abf07eb47c2f2394a0bb41bb
+EBUILD dracut-038-r1.ebuild 7894 SHA256 f6a80a07482129ebb880b01afc3a9de6b8206d6a14a27b23c568e596d9bf3d36 SHA512 37115967a5c1b77473763d1c6732d3355a699693a35358e8173dfcec2e1cadc90a045ec90371cd141150e0353fb799a98a181d65f7dad007d733335e607d84aa WHIRLPOOL 158c37c114674ed3ce9ba68573fbd3f5f0dcd6d7466dc6666df0204549c210bd6d1f4dfa102486ad60e1a51f688666e8fb2faa45db3d444f52d663a12a13b62a
 EBUILD dracut-038.ebuild 7822 SHA256 ae749342f1b21a449957aec4b073c42f4fa679a4b41615f20f2f7f202b256cda SHA512 88a12a05afa57a0ccbc6b08c1a162bc8cc65278c214dc8613a67eff07e1292ee6af0afa0d934a4a4e95a0695453dd7679b8623792c8238251e12e346354fca49 WHIRLPOOL d831992f94bf4e38f9ef6e76e98c9665e0904c375458ab36e0ef112ad83f94218a1a2da9078b92334fbec849e5597dd982ccbe147c5bcf6d4f69eb352b3e1d3d
-MISC ChangeLog 73455 SHA256 68e138b998960f4bd742f0aca8fb2b55ec9583f45e540d4bb79abf9442d5898a SHA512 efb445ea2fcc8648f0d7f6ef32fdd4bade6c36585b83aa891e538571c317a205c07296cfb4ad4b540b59bdbf8000c6d5a5ddc82595af6232fcf1a5a30a21109b WHIRLPOOL 6a5cd0be758665fab14f7d1f33248aa762827dbb3faa09ee8aeff90e14dc9ec567b80480892fdee6796b6fbd0148f496a569f89c62693b0dd86d63c2c519830b
+MISC ChangeLog 73676 SHA256 8756092b6fa387610f119e0eaab92193a1fe427feb4c8b559af28349df845e2b SHA512 f7f140677672c302b18818be1d6a3100731bd4319fab88864dd1641688ed6a65f4dc6ffd3dcc550ea6de716ccb76dc54098022b6780897ede21d6eb41c740737 WHIRLPOOL 2aed2ee87548cabcc7ae39aeb01456e9daac55319dc7ad382df4dc15ca58a8b6f277f15c8386e8986a03b2d647462e32d0dadc6a2f23f6df4ea07fe4e8a333d4
 MISC metadata.xml 906 SHA256 5f19b725d0669877fdd7814634b7aa7dd73331459bace52de02908417b833c3f SHA512 c5838d36080528d541b67cb38de17cc2351f7e5e17ab060c58f037792225ea223ade6b7e69376f4a9256b0bb3dcf4de578dcd50ee1c7d04a3f3288ca3c1ada43 WHIRLPOOL 532ea421fab965094820d5c0961a00ca38c858461f572a0cd4a145aa90340a569ee942062338ae03773c2709a08e4882f3176333aa5383b7e3c467cb01c0874d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTyNMTAAoJEPATRTHh2/q1swwH/RLuxY/UjhUZZugUPECE+8gb
-JVVErJw/jJ/u+ldkSVgmsnuT8UVslT22CrA3wRc9+j/PV2NqWLfYzMdJy8TQ7Z9d
-ar7Z8KgbIqeDwudypS50epRIoHn8JzDQ+3KlNx+FQ7USMhy5qGZjIwamF1Qv6t17
-x45bRhyxo44X6kkSrcXiyybUUOx+OIKvscmwvoiwY+zhoVYqONIyfzVJXlgAaj7n
-yUOcSy5m6sqCdfOEnHwMF3pmNUgAVWZZDO53XbWdutfIz9uBhG8bEHmH3jndY6/u
-6Xf42u+wozuO+6UmSoQqdT5BgBuXYU4Oc0djFqhhAHtwiKhMijDUYlKiFr70U4c=
-=Z+9S
+iQEcBAEBCAAGBQJTzMiXAAoJEPATRTHh2/q1Rb4H+wf3xyNyn34vtcu/zZELUTuw
+0WRuF3zj4RkgiP0bsFePOnzyvXp3yZYImySEQ1DzivRH21dgIbsrgeRnMEiZdQjo
+YkW4bRF8nC3SRKhOwS3v1eCfZRavheAVYhdy4U/ig8GZP2KKojIJ8OL9t9zqI222
+huFZ5U8mQava2zSeK3XT74weSiJtIwABHHFcBKR12q3LoVlKSv2/dSsiwwVg5r6c
+mRZl16LdxdNTeIQ6IVGp9x9ObPmBhP+exjNviEoZorF8sTiC8ED2K64NtZir8ypS
+s07fUlJn4CJeJeFag9UCa4VxKobzO5Fg+vK16N/uSgS5zz9NUworYwTJFtOrVUc=
+=PwWT
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-038-r1.ebuild b/sys-kernel/dracut/dracut-038-r1.ebuild
new file mode 100644
index 000000000000..577f9dff3d6b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-038-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-038-r1.ebuild,v 1.1 2014/07/21 08:00:22 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 )
+	selinux? ( sec-policy/selinux-dracut )
+	"
+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/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	"
+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}-0004-Install-dracut-install-into-libexec-di.patch"
+	"${FILESDIR}/${PV}-0005-modsign-do-not-hardcode-path-to-keyctl.patch"
+	"${FILESDIR}/${PV}-0006-inst_simple-doesn-t-take-H-parameter.patch"
+	)
+
+#
+# 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
+}
+
+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 sys-apps/usleep 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" \
+		dev-libs/openssl
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/files/038-0006-inst_simple-doesn-t-take-H-parameter.patch b/sys-kernel/dracut/files/038-0006-inst_simple-doesn-t-take-H-parameter.patch
new file mode 100644
index 000000000000..faf9e46a9817
--- /dev/null
+++ b/sys-kernel/dracut/files/038-0006-inst_simple-doesn-t-take-H-parameter.patch
@@ -0,0 +1,39 @@
+From 17eb419fc93a5ea3153306c59584d82253d80b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 21 Jul 2014 09:53:22 +0200
+Subject: [PATCH 6/6] inst_simple doesn't take '-H' parameter
+
+It was introduced in commit 5a5758.
+---
+ modules.d/90lvm/module-setup.sh  | 2 +-
+ modules.d/95zfcp/module-setup.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index 00d4e5a..5b810b9 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
+@@ -59,7 +59,7 @@ install() {
+ 
+     if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then
+         if [ -f /etc/lvm/lvm.conf ]; then
+-            inst_simple -H /etc/lvm/lvm.conf
++            inst_simple /etc/lvm/lvm.conf
+             # FIXME: near-term hack to establish read-only locking;
+             # use command-line lvm.conf editor once it is available
+             sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 4/' ${initdir}/etc/lvm/lvm.conf
+diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh
+index 9526caa..b96ccd2 100755
+--- a/modules.d/95zfcp/module-setup.sh
++++ b/modules.d/95zfcp/module-setup.sh
+@@ -31,6 +31,6 @@ install() {
+     inst_rules 56-zfcp.rules
+ 
+     if [[ $hostonly ]]; then
+-        inst_simple -H /etc/zfcp.conf
++        inst_simple /etc/zfcp.conf
+     fi
+ }
+-- 
+2.0.0
+