Merge branch 'bug-314575' using --no-ff

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)

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

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}"`
@@ -294,7 +297,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