You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/08/16 12:55:40 UTC
[09/50] git commit: updated refs/heads/saml2 to 09da909
need to check ccp-qemu-img
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f30fc6b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f30fc6b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f30fc6b6
Branch: refs/heads/saml2
Commit: f30fc6b673aba05894be3a6075db16927cc1aa8c
Parents: cb9319d
Author: Edison Su <su...@gmail.com>
Authored: Tue Aug 12 14:47:02 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Aug 12 15:13:42 2014 -0700
----------------------------------------------------------------------
scripts/storage/qcow2/managesnapshot.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fc6b6/scripts/storage/qcow2/managesnapshot.sh
----------------------------------------------------------------------
diff --git a/scripts/storage/qcow2/managesnapshot.sh b/scripts/storage/qcow2/managesnapshot.sh
index 42bd1eb..1ee69db 100755
--- a/scripts/storage/qcow2/managesnapshot.sh
+++ b/scripts/storage/qcow2/managesnapshot.sh
@@ -33,10 +33,16 @@ qemu_img="cloud-qemu-img"
which $qemu_img >& /dev/null
if [ $? -gt 0 ]
then
- which qemu-img >& /dev/null
+ which ccp-qemu-img >& /dev/null
if [ $? -eq 0 ]
then
+ qemu_img="ccp-qemu-img"
+ else
+ which qemu-img >& /dev/null
+ if [ $? -eq 0 ]
+ then
qemu_img="qemu-img"
+ fi
fi
fi