From f8520b7a36e52b39791a0290dcc4d140159e1448 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 8 Sep 2016 11:38:46 +0200
Subject: [PATCH] Bug #4768: attach_disk in qcow2 fails

---
 src/datastore_mad/remotes/ceph/cp | 2 +-
 src/tm_mad/qcow2/ln               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index bda056bcc5..b539c7f6fa 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -141,7 +141,7 @@ fi
 REGISTER_CMD=$(cat <<EOF
     set -e -o pipefail
 
-    FORMAT=\$($QEMU_IMG info $TMP_DST | grep "^file format:" | awk '{print \$3}')
+    FORMAT=\$($QEMU_IMG info $TMP_DST | grep "^file format:" | awk '{print \$3}' || :)
 
     if [ "\$FORMAT" != "raw" ]; then
         $QEMU_IMG convert -O raw $TMP_DST $TMP_DST.raw
diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
index 82a7ce872e..40c4fc8a13 100755
--- a/src/tm_mad/qcow2/ln
+++ b/src/tm_mad/qcow2/ln
@@ -102,7 +102,7 @@ if [ ! -L "${SNAP_DIR}/${SNAP_NAME}" ]; then
     ln -s "${SNAP_DIR}" "${SNAP_DIR}/${SNAP_NAME}"
 fi
 
-SNAP="\$(ls ${SNAP_DIR} | grep '^[[:digit:]]*$' | sort -n | tail -n 1)"
+SNAP="\$(ls ${SNAP_DIR} | grep '^[[:digit:]]*$' | sort -n | tail -n 1 || :)"
 
 if [ -z "\${SNAP}" ]; then
     SNAP=0