gentoo resync : 15.09.2018

6 files changed, 213 insertions, 36 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 61318f25a036..a2b04b59bc23 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/noflushd/Manifest b/sys-block/noflushd/Manifest
index 0cfbdc0efa47..5fb5885d70c7 100644
--- a/sys-block/noflushd/Manifest
+++ b/sys-block/noflushd/Manifest
@@ -2,8 +2,6 @@ AUX noflushd.confd 241 BLAKE2B e2b4a7b6ec13597d790c111655106f00d74698e2f19f44028
 AUX noflushd.rc6 664 BLAKE2B 64e084160e015ca15bb0d4505be844457c0493a65877530d9e90c22ee0a0334a445b622cf38bc426ad800032bae1211b30d6aac0f7577f9128dfb32c6b77e90a SHA512 f541bc82ebc81fe4c09fbd02a8aee1668d3e8fec738c552219dd4d5741be5ac1a4abb544cb800d6f182b00f6021fe84858f0befbb1317ca5ec5a9092d64ba2cd
 DIST noflushd-2.7.3.tar.gz 145328 BLAKE2B 66506b268176d291986791b5e1d38131f6e796a20844cd3924b05336e288c3a0be88c1acde4a314638b76b1c85ab1d12f2381b4a1894e77228a5f08643bc02dc SHA512 3db9f5d005dd097211df65dbeb6dcb44fc66dfac66de63e004337762e5128748f5f15fd5550dad5f346bd774c664d509acf0c69b6fd33414439f5ee17689ba05
 DIST noflushd-2.8.tar.gz 180386 BLAKE2B b3b90dc09ff6e61f874c3e738c3df31351c684e397ef6c357a864fb0265a905e927e5663b95bdb194b343a66dbf514deb0591684a9f9c9ece17f8e78a4c5373f SHA512 2bffb61aa380409efc43e7ff93d1efd93812dd2c66b4635101a608f1bd5094545e4db64e03fd318be3d3ac50be6e7278b17d9bb9ccd30c52f5e2e4337f749b50
-DIST noflushd_2.7.5.orig.tar.gz 149854 BLAKE2B a357d1a88febbd4a27056af37bfbbf7c3c26d7a741ebd2b85c449e8ee70ae9a0ba2f6c0ad1af240d8b740586f1476a986b6d47607ce61180ed8b0d82177024dd SHA512 4ad33dc3d9460db150f4c68dd94597c639fdc75fa43f1de6dbf8c278d3ff80df2112fbd50d94ecb5cfb49820fc0ab9076f6a3bc345f93ca3f5ae4d369bc1fb0f
 EBUILD noflushd-2.7.3.ebuild 959 BLAKE2B 44b02d5175fe847248318710b98ebe4e7312c5c60ab16a1cf597c0a517817a3b355637a8ba55196cdd9a4b8912dae48b7f16d19e2afba1536e9a87a4d55e346e SHA512 59944f9970fe508cc3cdb8bbcffc3d9ef61d500f3d0fcd14e0872763633e7f73a027ae2dfe3414041bc3050e605659ed751e1c91340fd735065ed627818624f4
-EBUILD noflushd-2.7.5.ebuild 772 BLAKE2B 33ebb7f3cbb3e52d0f921ed7c004f9474d86b43be9426de9aebd3b9783ea321f0a00901d757aa21adcfdd3fc2e164bca65d902b321785bd781c22d2b1c56bf47 SHA512 0aa0df5f46c36de13e1eeed883fb01a37dcfb482c7b078e46547caa445a5f6c3ec1ff23dfda5c29a03841e560933e939843a3f25494436256bc16a4adfe7f9d8
 EBUILD noflushd-2.8.ebuild 735 BLAKE2B 927c828efcb9d6ef1675763420975757ce29fce9f69a415214e09d3b63b552bfce89d6f82226bbaf56bb40e6b8b888095c1837f13e25acb3afee1bdcfc441304 SHA512 5c68a7dc940452dfba1ee886fa93d44c6055593b13480f2abe97a6016d36a9d60d6d7d4c41b441017cc5b75b610797692ac59c7d374ce6b832ac86f7105514de
 MISC metadata.xml 328 BLAKE2B 0360db5b7dcc12efa157d0b845445a989f9edb2b3339c84943cd9c9a98078f16ad05bee3a09a6e55f0402cf24b6deb440a3a5a76edd83a0627d280eb9889d794 SHA512 f7e518c8e327d595d8d325bd29f2723556870034444a11eb4ad010ff79d237756e3cd75b91f29650c2d8f7236c9bcb485e3627640455a89ec363ac27fdba57ab
diff --git a/sys-block/noflushd/noflushd-2.7.5.ebuild b/sys-block/noflushd/noflushd-2.7.5.ebuild
deleted file mode 100644
index 510481c94f5a..000000000000
--- a/sys-block/noflushd/noflushd-2.7.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A daemon to spin down your disks and force accesses to be cached"
-HOMEPAGE="http://noflushd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/noflushd/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	econf \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-initdir=/etc/init.d
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc NEWS
-	prepalldocs
-
-	newinitd "${FILESDIR}"/noflushd.rc6 noflushd
-	newconfd "${FILESDIR}"/noflushd.confd noflushd
-}
-
-pkg_postinst() {
-	ewarn "noflushd works with IDE devices only."
-	ewarn "It has possible problems with reiserfs, too."
-}
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 1112b31946b7..ffd74798c025 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -21,11 +21,13 @@ AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213d
 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064
 AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240
 AUX open-iscsi-2.0.876-musl-fixes.patch 2323 BLAKE2B c69d973bdc48adc1f4f8e5680f8cf108172f708889bb740cd7960f09dd48ee29d6ccdbf6f1ed08579838fc1913cd3c8ee0b9325714e793de5884eb6faea0e161 SHA512 2224465ba4ae0f8eb195a1181304e17285c6501320f1458b6eb9d092a19c08bdedb08e8b88bfc319eb878a18fb1b487842719fa24f69f5885b1ba7845197fe12
+AUX open-iscsi-2.0.876_p20180814-musl-fixes.patch 2057 BLAKE2B 6dea839a582be9e096ec35cd61eaf173300353e71bf2df57ca420c2a7921e91282fbd206815cbdf5baab8ffe499b86412092680bc4b9342fa1796d5a2fc502ed SHA512 10db0c0123342797824ec241d0769b431ce10aaca32d0242ebee98258e6236ee5492afc8b8a20a9842339fbb4a0c7c4c7c158b4d0c6651890d4c1af9e81733bd
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
+DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
 EBUILD open-iscsi-2.0.872-r2.ebuild 2987 BLAKE2B 9de1e02c0f2373cdcfb333d8e944f6329dba97fabafbd41ad375519e5c10f9d9d47d58053616caf098b27ec220dc5098a2d0ee39ed33878d1bc89c00e66db280 SHA512 4572c1e2d0cf162d414d3c3771acabaf25f2057d7c25853adf5cc61106a59c86e9d3241690af477ab78023b3af3d1ee5d311ce88a21e7274accc169daf45e41e
 EBUILD open-iscsi-2.0.872-r3.ebuild 3163 BLAKE2B 37fc57e2fe93d99c8c863092d63fcc372899f519a9001b3fff3d24350e502ba100811f316c841a3d2e0a00250ec65219af6efcd40167bb08c7dda35984f395a5 SHA512 611cad8dca44eba6c5d512bad51b6018e3c6ab9b1a187c96f56957ab047789b53e9f4ec211b5a6fc6d8c08615812a03b95ed98d80505156952236e7a4a67c4c1
 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
@@ -37,4 +39,5 @@ EBUILD open-iscsi-2.0.874-r2.ebuild 3666 BLAKE2B 05affe10aa1657fbfe9aee479f5ba48
 EBUILD open-iscsi-2.0.874.ebuild 3164 BLAKE2B 3a001be2ab05943a7614f35e39da4286751cece5e2b7832799211fc1a33c81b437e22ba64269f46a19e38ae80a11993b2e0d5d7d7beb036acf1ce02139cb0b5e SHA512 19219e336d2e289dfa0d2b1e28d8b7d1274f734fd6cd55be1512254412a2688122fc1fe6137d4050cb62160981a358366184c668369212103d28fcdaa1305278
 EBUILD open-iscsi-2.0.875.ebuild 3713 BLAKE2B b3ec80066fd3c7bf72e56361e59213ba8b8a4d57e777394e5842458620a712c14ad93cc1b69f47f266360570cc6c63be94582ea3f460730ef920320a5635c397 SHA512 8af21fe4129b7af58f2e126bb5c6f8e7f6b764246686dd2a7c80e13ea90f691bcb6722a8a4a6d688d096fa7d414fd52c0a214d7c1212d40495bbbddd241b7132
 EBUILD open-iscsi-2.0.876.ebuild 3620 BLAKE2B 62aa39170d32cea0f523cf148fa3770fc027b4db72d719996c5621062be9e9f593c95bf3b4a108ae62c13a172a84dc96ffa6587e3e3f51f9635af10abb3a0d6a SHA512 1bb4f8e5e98b93a704242a89e40b692f83dac92497fe018fd87fd635d2a289b7597874fdfa02004b3fd01e2809e45ea514c2a9f86d8ee29c12533bb2638785ff
+EBUILD open-iscsi-2.0.876_p20180814.ebuild 3720 BLAKE2B 3c79355c91913be2b77b5150c3828e70f08938c6911e96121920fe7d0cc86caa2303580b97d33c2f7b7a84333935f54969eddb14361fb513ca086d8ff286ad26 SHA512 df58eff2caabc6afd4a1ad416bbac464c7f6cb5e8cfa2ccf4b6dc0b971f00e091bfbb2e17a50781b858586ca01e9146bf2dca9ac56d7b46a1305664f728fc2b9
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch
new file mode 100644
index 000000000000..68b1bca7c7cd
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch
@@ -0,0 +1,85 @@
+--- a/usr/idbm.c
++++ b/usr/idbm.c
+@@ -27,2 +27,3 @@
+ #include <errno.h>
++#include <fcntl.h>
+ #include <dirent.h>
+--- a/usr/iscsiadm.c
++++ b/usr/iscsiadm.c
+@@ -3269,2 +3269,3 @@
+ 	int do_discover = 0, sub_mode = -1;
++	int argerror = 0;
+ 	int portal_type = -1;
+@@ -3458,2 +3459,5 @@
+ 			usage(0);
++		case '?':
++			log_error("unrecognized character '%c'", optopt);
++			argerror = 1;
+ 		}
+@@ -3473,4 +3477,3 @@
+ 
+-	if (optopt) {
+-		log_error("unrecognized character '%c'", optopt);
++	if (argerror) {
+ 		rc = ISCSI_ERR_INVAL;
+--- a/iscsiuio/src/unix/libs/bnx2x.c
++++ b/iscsiuio/src/unix/libs/bnx2x.c
+@@ -44,3 +44,3 @@
+ #include <linux/sockios.h>
+-#include <linux/ethtool.h>
++#include "ethtool-compat.h"
+ #include <sys/mman.h>
+--- /dev/null
++++ b/iscsiuio/src/unix/libs/ethtool-compat.h
+@@ -0,0 +1,51 @@
++/*
++ * ethtool-compat.h: adopted from
++ # ethtool.h: Defines for Linux ethtool.
++ *
++ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
++ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
++ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
++ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
++ *                                christopher.leech@intel.com,
++ *                                scott.feldman@intel.com)
++ * Portions Copyright (C) Sun Microsystems 2008
++ */
++
++#include <linux/types.h>
++#include <netinet/if_ether.h>
++
++#define ETHTOOL_FWVERS_LEN	32
++#define ETHTOOL_BUSINFO_LEN	32
++#define ETHTOOL_EROMVERS_LEN	32
++
++struct ethtool_drvinfo {
++	__u32	cmd;
++	char	driver[32];
++	char	version[32];
++	char	fw_version[ETHTOOL_FWVERS_LEN];
++	char	bus_info[ETHTOOL_BUSINFO_LEN];
++	char	erom_version[ETHTOOL_EROMVERS_LEN];
++	char	reserved2[12];
++	__u32	n_priv_flags;
++	__u32	n_stats;
++	__u32	testinfo_len;
++	__u32	eedump_len;
++	__u32	regdump_len;
++};
++
++struct ethtool_tcpip4_spec {
++	__be32	ip4src;
++	__be32	ip4dst;
++	__be16	psrc;
++	__be16	pdst;
++	__u8    tos;
++};
++
++struct ethtool_ah_espip4_spec {
++	__be32	ip4src;
++	__be32	ip4dst;
++	__be32	spi;
++	__u8    tos;
++};
++
++#define ETHTOOL_GDRVINFO	0x00000003 /* Get driver info. */
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild
new file mode 100644
index 000000000000..b111b48a68e6
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+MY_COMMIT="96c1a8e344d93594a3bb4faa848f878cc7315bde"
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma"
+
+DEPEND="sys-block/open-isns:=
+	infiniband? ( sys-fabric/ofed )
+	sys-kernel/linux-headers"
+RDEPEND="${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch"
+	"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtin options don't work. See this for
+	# more information:
+	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	RDMA_MODULES="INFINIBAND_ISER"
+	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
+	if linux_config_exists; then
+		if use tcp; then
+			for module in ${TCP_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use infiniband; then
+			for module in ${INFINIBAND_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use rdma; then
+			for module in ${RDMA_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
+			done
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
+	default
+
+	pushd iscsiuio >/dev/null || die
+	eautoreconf
+	popd >/dev/null || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+	append-lfs-flags
+}
+
+src_compile() {
+	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+	# is messed up already here, so it's not making it that much worse.
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		user
+}
+
+src_install() {
+	emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+	# Upstream make is not deterministic, per bug #601514
+	rm -f "${ED}"/etc/initiatorname.iscsi
+
+	dodoc README THANKS
+
+	docinto test/
+	dodoc test/*
+
+	insinto /etc/iscsi
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+	newinitd "${FILESDIR}"/iscsid-init.d iscsid
+
+	systemd_dounit "${S%/}"/etc/systemd/iscsid.service
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi
+	fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
+		{
+		  cat "${EROOT}${in}.example"
+		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
+		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
+		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
+	fi
+}