From eb24f810be7f1143e8676c32d091f6a510cca037 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Fri, 7 Sep 2012 01:11:26 +0300 Subject: [PATCH 1/2] [PATCH] pan-up: Teach pan-up about --stay --stay means keep pan-up running until pan_otgtd exits Signed-off-by: Boaz Harrosh --- up-pan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/up-pan b/up-pan index 7da0639..b89cf98 100755 --- a/up-pan +++ b/up-pan @@ -12,6 +12,7 @@ set OTGTD=$dir/$OTGTD_NAME set TARGETNAME=`/pan/bin/getdevinfo -q datasn` # logfile name set LOG="/var/log/otgtd.log" +set STAY="" switch($1) case "down": @@ -40,7 +41,9 @@ case "stat": breaksw default: - if ("$1" != "") then + if ("$1" == "--stay") then + set STAY="yes" + elseif ("$1" != "") then echo "what is $0 $1?!?" exit endif @@ -76,3 +79,7 @@ $TGTADM --lld iscsi --mode logicalunit \ $TGTADM --lld iscsi --mode target --op show echo "otgtd started, run up down to stop" + +if ("$STAY"="yes") then + wait +endif From 38106baad3700d71c214396ff0169a458033a0c6 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Fri, 7 Sep 2012 03:06:18 +0300 Subject: [PATCH 2/2] tgt: Try new osd-devel branch with latest tgt fixes from origin osc-osd was currently based on tgt version v1.0.2 Upstream tree had fixes and additions up to v1.0.31 (Fffoo) So I rebased all osd patches on top of v1.0.31 Signed-off-by: Boaz Harrosh --- tgt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgt b/tgt index 6bb84a5..df0815c 160000 --- a/tgt +++ b/tgt @@ -1 +1 @@ -Subproject commit 6bb84a5466cd39f780482dfd9cb1a672e8821539 +Subproject commit df0815cafca1e85b76ab7e0c9cc2ca2b7bd956a3