From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager stable-6] pve6to7: skip user.cfg if it does not exist
Date: Wed, 30 Jun 2021 15:32:23 +0200 [thread overview]
Message-ID: <20210630133223.2994961-1-d.csapak@proxmox.com> (raw)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/CLI/pve6to7.pm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 6dd7760c..1c89242d 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -608,6 +608,11 @@ sub check_cifs_credential_location {
sub check_custom_pool_roles {
log_info("Checking custom roles for pool permissions..");
+ if (! -f "/etc/pve/user.cfg") {
+ log_skip("user.cfg does not exist");
+ return;
+ }
+
my $raw = eval { PVE::Tools::file_get_contents('/etc/pve/user.cfg'); };
if ($@) {
log_fail("Failed to read '/etc/pve/user.cfg' - $@");
--
2.30.2
next reply other threads:[~2021-06-30 13:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 13:32 Dominik Csapak [this message]
2021-06-30 14:34 ` [pve-devel] applied: " 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=20210630133223.2994961-1-d.csapak@proxmox.com \
--to=d.csapak@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal