Add iBFT support for iSCSI

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 249b721d8dfd869aafe11c02d14b8b586e2973ea..f7f01dedddddbd5bbc8fa94641b248cc1b95ad5e 100755 (executable)
--- 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 f1e124b7cc3ba2c26d77d43a4dc0d707c3598feb..ae0535b9093552915d6f5bf71b75db171c9ce060 100755 (executable)
--- 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