File 0019-rc.target.suse-Separate-tcm_-.sh-and-lio_-.sh-during.patch of Package lio-utils.216

From c4840b6400fd71937ac0f378993af8849c5de119 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 1 Feb 2013 15:00:02 +0100
Subject: rc.target.suse: Separate tcm_*.sh and lio_*.sh during startup

During startup we need to call the 'tcm' setup scripts before
lio_*.sh, otherwise the lio configuration will fail as the LUNs
are not yet available.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 scripts/rc.target.suse | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/rc.target.suse b/scripts/rc.target.suse
index 423c30a..dacdb77 100644
--- a/scripts/rc.target.suse
+++ b/scripts/rc.target.suse
@@ -101,7 +101,7 @@ function tcm_check() {
 }
 
 function run_fabric_cfs_ops() {
-	for i in $CONFIGFS_SCRIPT_DIR/*.sh; do
+	for i in $CONFIGFS_SCRIPT_DIR/tcm_*.sh; do
 
 		if [ ! -f $i ]; then
 			continue
@@ -110,12 +110,24 @@ function run_fabric_cfs_ops() {
 		if [ ${i##*/} == "tcm_start.sh" ]; then
 			continue
 		fi
+		echo -n $"Calling TCM ConfigFS script $i: "
+		sh $i > /dev/null 2>&1
+		if [ $RET != 0 ]; then
+		    rc_failed 1
+		fi
+		rc_status -v
+	done
+	for i in $CONFIGFS_SCRIPT_DIR/lio_*.sh; do
+
+		if [ ! -f $i ]; then
+			continue
+		fi
 		# iscsi-target fabric module is handled in run_lio_target_cfs_ops()
 		if [ ${i##*/} == "lio_start.sh" ]; then
 			continue
 		fi
 
-		echo -n $"Calling ConfigFS script $i: "
+		echo -n $"Calling LIO ConfigFS script $i: "
 		sh $i > /dev/null 2>&1
 		if [ $RET != 0 ]; then
 		    rc_failed 1
-- 
1.8.1.4