aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcraig <craig@haquarter.de>2010-10-11 00:21:05 +0200
committerSebastian Pipping <sebastian@pipping.org>2011-02-08 17:56:51 +0100
commitd9f46bb5131266f979734895feaaf921f49d30af (patch)
treee4070e06a28ae36faff65ac16faf5e773f97a4ae
parentFix error message (diff)
downloadgenkernel-d9f46bb5131266f979734895feaaf921f49d30af.tar.gz
genkernel-d9f46bb5131266f979734895feaaf921f49d30af.tar.bz2
genkernel-d9f46bb5131266f979734895feaaf921f49d30af.zip
Add iBFT support for iSCSI
-rwxr-xr-xdefaults/initrd.scripts8
-rwxr-xr-xdefaults/linuxrc5
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