From 098fe29463ce98ef6f039c949e67a0a0bbe897c0 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Fri, 16 Sep 2016 17:41:39 +0200
Subject: [PATCH] B #4781: move ssh_exec_and_log_no_exit to library

---
 src/mad/sh/scripts_common.sh | 19 ++++++++++++++++---
 src/tm_mad/ceph/mkimage      | 22 ----------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index 4f9e7f6909..84546daade 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -330,8 +330,8 @@ function mkfs_command {
     fi
 }
 
-#This function executes $2 at $1 host and report error $3
-function ssh_exec_and_log
+#This function executes $2 at $1 host and report error $3 but does not exit
+function ssh_exec_and_log_no_error
 {
     SSH_EXEC_ERR=`$SSH $1 bash -s 2>&1 1>/dev/null <<EOF
 export LANG=C
@@ -349,7 +349,20 @@ EOF`
             error_message "Error executing $2: $SSH_EXEC_ERR"
         fi
 
-        exit $SSH_EXEC_RC
+        return $SSH_EXEC_RC
+    fi
+
+    return 0
+}
+
+#This function executes $2 at $1 host and report error $3
+function ssh_exec_and_log
+{
+    ssh_exec_and_log "$@"
+    rc=$?
+
+    if [ $rc !=0 ]; then
+        exit $rc
     fi
 }
 
diff --git a/src/tm_mad/ceph/mkimage b/src/tm_mad/ceph/mkimage
index 2e5dc3f4d0..855a9ff0d8 100755
--- a/src/tm_mad/ceph/mkimage
+++ b/src/tm_mad/ceph/mkimage
@@ -24,28 +24,6 @@
 #   - vmid is the id of the VM
 #   - dsid is the target datastore (0 is the system datastore)
 
-function ssh_exec_and_log_no_exit
-{
-    SSH_EXEC_ERR=`$SSH $1 bash -s 2>&1 1>/dev/null <<EOF
-export LANG=C
-export LC_ALL=C
-$2
-EOF`
-    SSH_EXEC_RC=$?
-
-    if [ $SSH_EXEC_RC -ne 0 ]; then
-        log_error "Command \"$2\" failed: $SSH_EXEC_ERR"
-
-        if [ -n "$3" ]; then
-            error_message "$3"
-        else
-            error_message "Error executing $2: $SSH_EXEC_ERR"
-        fi
-
-        return $SSH_EXEC_RC
-    fi
-}
-
 SIZE=$1
 FSTYPE=$2
 DST=$3