From 7ac678fe0b7f852adcfc9f2998c16ddde5177350 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Mon, 16 Nov 2015 11:59:19 +0100
Subject: [PATCH] bug #4052: do not create snap dirs for CDs

for qcow2 TM drivers

(cherry picked from commit 9cad48284d2fccb8457150d4f30918333d0c1d73)
---
 src/tm_mad/qcow2/clone | 14 ++++++++++----
 src/tm_mad/qcow2/ln    |  8 +++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/tm_mad/qcow2/clone b/src/tm_mad/qcow2/clone
index 20b75f2798..6e89d75d7e 100755
--- a/src/tm_mad/qcow2/clone
+++ b/src/tm_mad/qcow2/clone
@@ -80,11 +80,16 @@ ssh_make_path $DST_HOST $DST_DIR
 # Clone (cp) SRC into DST
 #-------------------------------------------------------------------------------
 
-if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
-   RESIZE_CMD="qemu-img resize ${DST_PATH} ${SIZE}M"
-fi
+type="$(file -b --mime-type $SRC_PATH)"
 
-CLONE_CMD=$(cat <<EOF
+if [ "$type" == "application/x-iso9660-image" ]; then
+    CLONE_CMD="cp ${SRC_PATH} ${DST_PATH}"
+else
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+       RESIZE_CMD="qemu-img resize ${DST_PATH} ${SIZE}M"
+    fi
+
+    CLONE_CMD=$(cat <<EOF
 cd $DST_DIR
 mkdir -p ${DST_PATH}.snap
 rm -f $DST_PATH
@@ -93,6 +98,7 @@ ln -s ${DST_PATH}.snap/0 ${DST_PATH}
 ${RESIZE_CMD}
 EOF
 )
+fi
 
 case $SRC in
 http://*)
diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
index 23e9cec534..fabd61fdce 100755
--- a/src/tm_mad/qcow2/ln
+++ b/src/tm_mad/qcow2/ln
@@ -64,7 +64,12 @@ ssh_make_path $DST_HOST $DST_DIR
 #-------------------------------------------------------------------------------
 log "Linking $SRC_PATH in $DST"
 
-CMD=$(cat <<EOT
+type="$(file -b --mime-type $SRC_PATH)"
+
+if [ "$type" == "application/x-iso9660-image" ]; then
+    CMD="ln -sf ${SRC_PATH} ${DST_PATH}"
+else
+    CMD=$(cat <<EOT
 set -ex
 
 mkdir -p "${SNAP_DIR}"
@@ -80,6 +85,7 @@ ln -sf "$SNAP_DIR/\$SNAP" "$DST_PATH"
 ln -sf "$SNAP_DIR" "${DST_PATH}.snap"
 EOT
 )
+fi
 
 ssh_exec_and_log $DST_HOST "$CMD" "Error linking $SRC to $DST"