From: craig <craig@haquarter.de>
Date: Sun, 10 Oct 2010 22:21:05 +0000 (+0200)
Subject: Add iBFT support for iSCSI
X-Git-Tag: v3.4.13~1^2~1^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9f46bb5131266f979734895feaaf921f49d30af;p=genkernel.git

Add iBFT support for iSCSI
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 249b721..f7f01de 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -689,10 +689,16 @@ startVolumes() {
 }
 
 startiscsi() {
+	
+	if [ ! -n "${ISCSI_NOIBFT}" ]
+	then
+		good_msg "Activating iSCSI via iBFT"
+		iscsistart -b
+	fi
 
 	if [ -n "${ISCSI_INITIATORNAME}" ] && [ -n "${ISCSI_TARGET}" ] && [ -n "${ISCSI_ADDRESS}" ]
 	then
-		good_msg "Activating iSCSI"
+		good_msg "Activating iSCSI via cmdline"
 
 		if [ "${ISCSI_TGPT}" ]
 		then
diff --git a/defaults/linuxrc b/defaults/linuxrc
index f1e124b..ae0535b 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -294,7 +294,10 @@ start_dev_mgr
 [ "${DO_slowusb}" ] && sleep 10
 
 # Start iSCSI
-startiscsi
+if [ -e /bin/iscsistart ]
+then
+	startiscsi
+fi
 
 # Setup btrfs, see bug 303529
 setup_btrfsctl