Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 371B8104E7 for ; Wed, 17 Jul 2013 22:01:13 +0000 (UTC) Received: (qmail 87616 invoked by uid 500); 17 Jul 2013 22:01:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 87572 invoked by uid 500); 17 Jul 2013 22:01:13 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 87564 invoked by uid 99); 17 Jul 2013 22:01:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 22:01:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CFB5C8ACB40; Wed, 17 Jul 2013 22:01:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Message-Id: <63d611cb2de043c0ba708b34390d10ab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 76e7985 Date: Wed, 17 Jul 2013 22:01:12 +0000 (UTC) Updated Branches: refs/heads/master c0db80fa1 -> 76e79851a vhd-util check doesn't work for some corrupted vhd file, use vhd-util read instead Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76e79851 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76e79851 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76e79851 Branch: refs/heads/master Commit: 76e79851a089b08d6160168f75c90a106605971c Parents: c0db80f Author: Anthony Xu Authored: Wed Jul 17 14:59:40 2013 -0700 Committer: Anthony Xu Committed: Wed Jul 17 15:01:01 2013 -0700 ---------------------------------------------------------------------- scripts/storage/secondary/createtmplt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e79851/scripts/storage/secondary/createtmplt.sh ---------------------------------------------------------------------- diff --git a/scripts/storage/secondary/createtmplt.sh b/scripts/storage/secondary/createtmplt.sh index d16386e..3fa43e3 100755 --- a/scripts/storage/secondary/createtmplt.sh +++ b/scripts/storage/secondary/createtmplt.sh @@ -198,7 +198,7 @@ if [ ${tmpltname%.vhd} != ${tmpltname} ] then if which vhd-util &>/dev/null then - vhd-util check -n ${tmpltimg2} > /dev/null + vhd-util read -p -n ${tmpltimg2} > /dev/null rollback_if_needed $tmpltfs $? "vhd check of $tmpltimg2 failed\n" vhd-util set -n ${tmpltimg2} -f "hidden" -v "0" > /dev/null rollback_if_needed $tmpltfs $? "vhd remove $tmpltimg2 hidden failed\n"