From 798c45d3dab8c24ba108ceb85c968cbb2958bd83 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 27 Jul 2013 23:43:15 +0200
Subject: [PATCH] linuxrc: simplify iscsi setup code

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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d8343cc..943d912 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1065,6 +1065,10 @@ start_volumes() {
 }
 
 start_iscsi() {
+	if [ ! -e /usr/sbin/iscsistart ]; then
+		return 0  # disabled
+	fi
+
 	if [ ! -n "${ISCSI_NOIBFT}" ]
 	then
 		good_msg "Activating iSCSI via iBFT"
diff --git a/defaults/linuxrc b/defaults/linuxrc
index f2b44cb..83e65e5 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -271,11 +271,7 @@ fi
 
 cd /
 
-# Start iSCSI
-if [ -e /usr/sbin/iscsistart ]
-then
-	start_iscsi
-fi
+start_iscsi
 
 # Setup btrfs, see bug 303529
 setup_btrfsctl