The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7459
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
From deef1786e9d93037c366bf24de5ffc82f467bd20 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Thu, 28 May 2020 12:20:59 +0100
Subject: [PATCH] lxd/storage/utils: Removes duplicated qemu-img call in
ImageUnpack
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/storage/utils.go | 6 ------
1 file changed, 6 deletions(-)
diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go
index e4b0d2f146..8e0c2b3107 100644
--- a/lxd/storage/utils.go
+++ b/lxd/storage/utils.go
@@ -576,12 +576,6 @@ func ImageUnpack(imageFile string, vol drivers.Volume,
destBlockFile string, blo
if err != nil {
return -1, err
}
-
- // Convert the qcow2 format to a raw block device.
- _, err = shared.RunCommand("qemu-img", "convert", "-O", "raw",
imageRootfsFile, destBlockFile)
- if err != nil {
- return -1, fmt.Errorf("Failed converting image to raw
at %s: %v", destBlockFile, err)
- }
} else {
// Dealing with unified tarballs require an initial unpack to a
temporary directory.
tempDir, err := ioutil.TempDir(shared.VarPath("images"),
"lxd_image_unpack_")
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
