From d9f46bb5131266f979734895feaaf921f49d30af Mon Sep 17 00:00:00 2001
From: craig <craig@haquarter.de>
Date: Mon, 11 Oct 2010 00:21:05 +0200
Subject: [PATCH 1/3] Add iBFT support for iSCSI

---
 defaults/initrd.scripts | 8 +++++++-
 defaults/linuxrc        | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

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

From 5e07592a758954bc72ce3f955fda1160794f46a2 Mon Sep 17 00:00:00 2001
From: craig <craig@haquarter.de>
Date: Mon, 11 Oct 2010 00:49:12 +0200
Subject: [PATCH 2/3] iBFT: fix iscsi_noibft

---
 defaults/linuxrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ae0535b..61efc95 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -178,6 +178,9 @@ do
 		iscsi_debug\=*)
 			ISCSI_DEBUG=`parse_opt "${x}"`
 		;;
+		iscsi_noibft)
+			ISCSI_NOIBFT=1
+		;;
 		# Crypto
 		crypt_root\=*)
 			CRYPT_ROOT=`parse_opt "${x}"`

From 79f6c2533d9719063acb8e217beb91237f7279bb Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 8 Feb 2011 17:59:22 +0100
Subject: [PATCH 3/3] Extend change log

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 53d5124..34d0695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
+  Add iBFT support for iSCSI (bug #314575)
+
+  Special thanks:
+  - Stefan Behte
+
   7 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Use devtmpfs/tmpfs for /dev (bug #353024)
   Rescue devtmpfs /dev over to chroot (bug #353024, bug #344407)