You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/22 10:18:57 UTC

git commit: updated refs/heads/4.4 to b44266a

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 c169ed1f3 -> b44266a3f


bugfix: systemvm template build failed

since newer vboxmanage generates $appliance-$branch-vmware-disk3.vmdk


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b44266a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b44266a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b44266a3

Branch: refs/heads/4.4
Commit: b44266a3f401196d52d6023624de79287be251a8
Parents: c169ed1
Author: ynojima <ma...@ynojima.net>
Authored: Wed May 21 18:23:29 2014 -0600
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 22 10:18:45 2014 +0200

----------------------------------------------------------------------
 tools/appliance/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b44266a3/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 6d2bd8f..a228e26 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -105,8 +105,8 @@ echo "$appliance exported for VMWare: dist/$appliance-$branch-vmware.vmdk.bz2"
 vboxmanage export $machine_uuid --output $appliance-$branch-vmware.ovf
 mv $appliance-$branch-vmware.ovf $appliance-$branch-vmware.ovf-orig
 java -cp convert Convert convert_ovf_vbox_to_esx.xslt $appliance-$branch-vmware.ovf-orig $appliance-$branch-vmware.ovf
-tar -cf $appliance-$branch-vmware.ova $appliance-$branch-vmware.ovf $appliance-$branch-vmware-disk1.vmdk
-rm -f $appliance-$branch-vmware.ovf $appliance-$branch-vmware.ovf-orig $appliance-$branch-vmware-disk1.vmdk
+tar -cf $appliance-$branch-vmware.ova $appliance-$branch-vmware.ovf $appliance-$branch-vmware-disk[0-9].vmdk
+rm -f $appliance-$branch-vmware.ovf $appliance-$branch-vmware.ovf-orig $appliance-$branch-vmware-disk[0-9].vmdk
 echo "$appliance exported for VMWare: dist/$appliance-$branch-vmware.ova"
 
 # Export for HyperV