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/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"
+

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}"