Hi,
On Fri, Nov 21, 2014 at 4:29 PM, <sw...@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 83656a6ea -> 8e689b114
>
>
> Updated the system vm build to remove incompatible qemu-img 'compat' option
>
>
This sort of reverts the following fix from Edison; (should we do it as the
following commit mentions not using compatibility breaks the systemvm in
some environment?)
commit 05bec59c1498dbcfb8a1089c86855fd3b433ea58
Author: Edison Su <sudi...@gmail.com>
Date: Thu Nov 6 15:09:31 2014 -0800
CS-27148 system vm image build process, needs to build an old version
of qemu image, otherwise, it won't work on RHEL 6 Reviewed-by:Frank
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e689b11
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e689b11
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e689b11
>
> Branch: refs/heads/master
> Commit: 8e689b1148e07d98378bb87f54528a92f79acedd
> Parents: 83656a6
> Author: Will Stevens <wstev...@cloudops.com>
> Authored: Fri Nov 21 05:59:06 2014 -0500
> Committer: Will Stevens <wstev...@cloudops.com>
> Committed: Fri Nov 21 05:59:06 2014 -0500
>
> ----------------------------------------------------------------------
> tools/appliance/build.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e689b11/tools/appliance/build.sh
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
> index afbae50..4ff99b8 100755
> --- a/tools/appliance/build.sh
> +++ b/tools/appliance/build.sh
> @@ -427,7 +427,7 @@ function kvm_export() {
> log INFO "creating kvm export"
> local hdd_path="${1}"
> vboxmanage internalcommands converttoraw -format vdi "${hdd_path}"
> raw.img
> - qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> + qemu-img convert -f raw -c -O qcow2 raw.img
> "${appliance_build_name}-kvm.qcow2"
> add_on_exit rm -f raw.img
> bzip2 "${appliance_build_name}-kvm.qcow2"
> mv "${appliance_build_name}-kvm.qcow2.bz2" dist/
>
>
