f376b2b9e2
Very clean rebase, only the +pve version handling needed manual fixing. Drops two applied patches from extra/ and adds one new from upstream (extra/0001*, fixes VNC over unix sockets) as well as 3 of my own for allowing password changes on custom VNC displays again (as seen and reviewed upstream, but not yet applied). Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
25 lines
802 B
Diff
25 lines
802 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:39 +0200
|
|
Subject: [PATCH] PVE: [Up] qemu-img: return success on info without snapshots
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
qemu-img.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index 908fd0cce5..5dc1d0a2ca 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -2977,7 +2977,8 @@ static int img_info(int argc, char **argv)
|
|
list = collect_image_info_list(image_opts, filename, fmt, chain,
|
|
force_share);
|
|
if (!list) {
|
|
- return 1;
|
|
+ // return success if snapshot does not exist
|
|
+ return 0;
|
|
}
|
|
|
|
switch (output_format) {
|