From da52fd08281543fee97ce5b1a658e47b67d5baab Mon Sep 17 00:00:00 2001
From: Torsten Kurbad <t.kurbad@iwm-tuebingen.de>
Date: Wed, 2 May 2007 11:09:44 +0000
Subject: [PATCH] New version of open-iscsi with conditional module loading by
 /etc/init.d/iscsid

git-svn-id: svn+ssh://svnintern.kmrc.de/projects/gentoo/iwm-overlay@4228 cbe59ace-07ea-0310-918e-868702b5370d
---
 sys-block/open-iscsi/Manifest                 | 20 +++++++++++--------
 sys-block/open-iscsi/files/iscsid-conf.d      |  8 ++++++++
 sys-block/open-iscsi/files/iscsid-init.d      |  4 +++-
 .../open-iscsi/open-iscsi-2.0.754.ebuild      |  2 ++
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100755 sys-block/open-iscsi/files/iscsid-conf.d

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index eb9b987..05059c0 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,15 +2,19 @@ AUX initiatorname.iscsi 1282 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 SHA
 MD5 c1652519ed63d33125269c9016b962ba files/initiatorname.iscsi 1282
 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 files/initiatorname.iscsi 1282
 SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3 files/initiatorname.iscsi 1282
-AUX iscsid-init.d 3598 RMD160 f409f2c0620ecbeceb05f6999e4815f7a46419cb SHA1 12b89df96c9926169ef311b95071e1d2535b4082 SHA256 5d9066f86164973c6d99c76a37a7371596090e9eea1316cd67a4f084de3d6ae1
-MD5 6c5621957755b1595ca12bd4fec0a1cf files/iscsid-init.d 3598
-RMD160 f409f2c0620ecbeceb05f6999e4815f7a46419cb files/iscsid-init.d 3598
-SHA256 5d9066f86164973c6d99c76a37a7371596090e9eea1316cd67a4f084de3d6ae1 files/iscsid-init.d 3598
+AUX iscsid-conf.d 276 RMD160 3e6de6c30fb77b8731512867cab8e5801db76a72 SHA1 1b81ad8382012bd98ad6d9c42f58c59623614527 SHA256 09d617fb76f8f61a1f99836286f424e0d9c0b57b9a382c3733ecb090b3fea100
+MD5 5e73851b295d89f10df35d676d837b26 files/iscsid-conf.d 276
+RMD160 3e6de6c30fb77b8731512867cab8e5801db76a72 files/iscsid-conf.d 276
+SHA256 09d617fb76f8f61a1f99836286f424e0d9c0b57b9a382c3733ecb090b3fea100 files/iscsid-conf.d 276
+AUX iscsid-init.d 3624 RMD160 96832ba245a2703dbbf8ea52330dc46d25c07c37 SHA1 dfba47a2d3477ba9b3e8a21c439d771c4d4db97a SHA256 7e8832486c52bb69127ad4a7b82b46b958b8cc069331531cfba8b9d0bd33e761
+MD5 155d5e54d06d23c9e2b039f067e3f4ce files/iscsid-init.d 3624
+RMD160 96832ba245a2703dbbf8ea52330dc46d25c07c37 files/iscsid-init.d 3624
+SHA256 7e8832486c52bb69127ad4a7b82b46b958b8cc069331531cfba8b9d0bd33e761 files/iscsid-init.d 3624
 DIST open-iscsi-2.0-754.tar.gz 223383 RMD160 841035a1da90e701719f4f7989616de9f613aac6 SHA1 1506a293d48dc88aff09299cb8f6f9d236905dbd SHA256 fc286e8bc457612af733fafab0608a25280b81f7306c9f218c9361e1fd8e573e
-EBUILD open-iscsi-2.0.754.ebuild 2303 RMD160 d6b3a32da47c6201641dc5d4a6ec1673a7269e27 SHA1 f31cfec163228378d2621a0a33b667fae0b50334 SHA256 cbe061d185470710e39ce6406771faa47f1ea7f03a2246c95d8610c45a2055b5
-MD5 8a849a89afaf607974bbab90a3874ac3 open-iscsi-2.0.754.ebuild 2303
-RMD160 d6b3a32da47c6201641dc5d4a6ec1673a7269e27 open-iscsi-2.0.754.ebuild 2303
-SHA256 cbe061d185470710e39ce6406771faa47f1ea7f03a2246c95d8610c45a2055b5 open-iscsi-2.0.754.ebuild 2303
+EBUILD open-iscsi-2.0.754.ebuild 2365 RMD160 9c111ca890fcf37583cad293201c505900e4c0e5 SHA1 b4fe12f059f703fbc616e53cc19b520e312a7ea8 SHA256 121be1d84b9b981634ae79ff00d524dde5884d53d89f75eafb5570367df7ac47
+MD5 fe064a87f0af29a40ad27486caedd070 open-iscsi-2.0.754.ebuild 2365
+RMD160 9c111ca890fcf37583cad293201c505900e4c0e5 open-iscsi-2.0.754.ebuild 2365
+SHA256 121be1d84b9b981634ae79ff00d524dde5884d53d89f75eafb5570367df7ac47 open-iscsi-2.0.754.ebuild 2365
 MD5 2205c92654f59f3b784966cdcdc97394 files/digest-open-iscsi-2.0.754 256
 RMD160 35d5d4379fb7f611631d3863daffbd4034d3de06 files/digest-open-iscsi-2.0.754 256
 SHA256 ac44155a6a3320e0f4e16047ac251f48f127ca2b2067163cb2a9a7ce23822e3a files/digest-open-iscsi-2.0.754 256
diff --git a/sys-block/open-iscsi/files/iscsid-conf.d b/sys-block/open-iscsi/files/iscsid-conf.d
new file mode 100755
index 0000000..1e2e724
--- /dev/null
+++ b/sys-block/open-iscsi/files/iscsid-conf.d
@@ -0,0 +1,8 @@
+# /etc/conf.d/iscsid
+
+# If you built one or more of the iSCSI modules into
+# the monolithic part of the kernel, you have to
+# remove the relevant modules from the list below to
+# prevent the init script from trying to load them.
+LOAD_MODULES="scsi_transport_iscsi iscsi_tcp"
+
diff --git a/sys-block/open-iscsi/files/iscsid-init.d b/sys-block/open-iscsi/files/iscsid-init.d
index fae9e37..0b3805d 100644
--- a/sys-block/open-iscsi/files/iscsid-init.d
+++ b/sys-block/open-iscsi/files/iscsid-init.d
@@ -50,7 +50,9 @@ do_modules() {
 
 start() {
 	checkconfig || return 1
-	do_modules 'Loading iSCSI modules' 'scsi_transport_iscsi iscsi_tcp'
+	if [ -n "${LOAD_MODULES}" ] ; then
+		do_modules 'Loading iSCSI modules' "${LOAD_MODULES}"
+	fi
 	ret=$?
 	[ $ret -ne 0 ] && return 1
 	ebegin "Starting ${NAME}"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.754.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.754.ebuild
index 1e8845c..b8f2713 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.754.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.754.ebuild
@@ -57,6 +57,8 @@ src_install() {
 	insinto /etc/iscsi
 	doins etc/iscsid.conf
 	doins ${FILESDIR}/initiatorname.iscsi
+	insinto /etc/conf.d
+	newins ${FILESDIR}/iscsid-conf.d iscsid
 	newinitd ${FILESDIR}/iscsid-init.d iscsid
 
 	# security