From 650b3b1f986d3edf0c9dd5799a9ec2056bf63ba3 Mon Sep 17 00:00:00 2001 From: Marcin Engelmann Date: Sun, 21 Jan 2018 09:52:07 +0100 Subject: [PATCH] qemu-img also supports raw and qcow2 formats, so let's allow shrinking them too --- bootstrapvz/plugins/minimize_size/README.rst | 2 +- bootstrapvz/plugins/minimize_size/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/plugins/minimize_size/README.rst b/bootstrapvz/plugins/minimize_size/README.rst index b640b27..93dc42c 100644 --- a/bootstrapvz/plugins/minimize_size/README.rst +++ b/bootstrapvz/plugins/minimize_size/README.rst @@ -21,7 +21,7 @@ footprint: (only applicable when using vmdk backing). The tool is part of the `VMWare Workstation `__ package. - - `qemu-img` (only applicaple when using vmdk or vdi backing). This + - `qemu-img` (only applicaple when using vmdk, vdi, raw or qcow2 backing). This tool is part of the `QEMU emulator `__. - Tell apt to only download specific language files. See the diff --git a/bootstrapvz/plugins/minimize_size/__init__.py b/bootstrapvz/plugins/minimize_size/__init__.py index b07fa0c..10420ae 100644 --- a/bootstrapvz/plugins/minimize_size/__init__.py +++ b/bootstrapvz/plugins/minimize_size/__init__.py @@ -26,8 +26,8 @@ def validate_manifest(data, validator, error): shrink_type = get_shrink_type(data['plugins']) if shrink_type == 'vmware-vdiskmanager' and data['volume']['backing'] != 'vmdk': error('Can only shrink vmdk images with vmware-vdiskmanager', ['plugins', 'minimize_size', 'shrink']) - if shrink_type == 'qemu-img' and data['volume']['backing'] not in ('vmdk', 'vdi'): - error('Can only shrink vmdk and vdi images with qemu-img', ['plugins', 'minimize_size', 'shrink']) + if shrink_type == 'qemu-img' and data['volume']['backing'] not in ('vmdk', 'vdi', 'raw', 'qcow2'): + error('Can only shrink vmdk, vdi, raw and qcow2 images with qemu-img', ['plugins', 'minimize_size', 'shrink']) def resolve_tasks(taskset, manifest):