public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH stable-7 manager 2/2] pve7to8: avoid confusing warning about required setting 'storage' for vzdump
Date: Wed, 21 Jun 2023 17:02:01 +0200	[thread overview]
Message-ID: <20230621150201.100421-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230621150201.100421-1-f.ebner@proxmox.com>

It's required in the schema for notes-template and protected, but when
parsing vzdump.conf, it shouldn't matter whether the storage parameter
is set or not.

The warning is ugly and users might interpret it as something that
needs to be acted upon for the upgrade:
parse error in '/etc/vzdump.conf' - 'storage': missing property - 'notes-template' requires this property\nmissing property - 'protected' requires this property

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Intended for both master and stable-7.

 PVE/CLI/pve7to8.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 87dc1dc3..2c288a2a 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -613,6 +613,8 @@ sub check_backup_retention_settings {
 
     eval {
 	my $confdesc = PVE::VZDump::Common::get_confdesc();
+	# vzdump.conf by itself doesn't need to honor any 'requires'
+	delete $confdesc->{$_}->{requires} for keys $confdesc->%*;
 
 	my $fn = "/etc/vzdump.conf";
 	my $raw = PVE::Tools::file_get_contents($fn);
-- 
2.39.2





  reply	other threads:[~2023-06-21 15:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-21 15:02 [pve-devel] [PATCH stable-7 manager 1/2] pve7to8: remove outdated warning about retention Fiona Ebner
2023-06-21 15:02 ` Fiona Ebner [this message]
2023-06-21 16:16   ` [pve-devel] applied: [PATCH stable-7 manager 2/2] pve7to8: avoid confusing warning about required setting 'storage' for vzdump Thomas Lamprecht
2023-06-21 16:16 ` [pve-devel] applied: [PATCH stable-7 manager 1/2] pve7to8: remove outdated warning about retention Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230621150201.100421-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal