* [pve-devel] [PATCH manager stable-6] pve6to7: skip user.cfg if it does not exist
@ 2021-06-30 13:32 Dominik Csapak
2021-06-30 14:34 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2021-06-30 13:32 UTC (permalink / raw)
To: pve-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH manager stable-6] pve6to7: skip user.cfg if it does not exist
2021-06-30 13:32 [pve-devel] [PATCH manager stable-6] pve6to7: skip user.cfg if it does not exist Dominik Csapak
@ 2021-06-30 14:34 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2021-06-30 14:34 UTC (permalink / raw)
To: Proxmox VE development discussion, Dominik Csapak
On 30.06.21 15:32, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> PVE/CLI/pve6to7.pm | 5 +++++
> 1 file changed, 5 insertions(+)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-30 14:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 13:32 [pve-devel] [PATCH manager stable-6] pve6to7: skip user.cfg if it does not exist Dominik Csapak
2021-06-30 14:34 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox