From fbd3dde73543e7715ca323bebea539db1a95d480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 3 Jul 2023 09:03:31 +0200 Subject: [PATCH] fix #4822: vzdump: fix pbs encryption for no-disk guests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit these are backed up directly with proxmox-backup-client, and the invocation was lacking the key parameters. Signed-off-by: Fabian Grünbichler Signed-off-by: Thomas Lamprecht --- PVE/VZDump/QemuServer.pm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index af197882..e1f46f89 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -526,6 +526,24 @@ sub archive_pbs { if (defined(my $ns = $scfg->{namespace})) { push @$cmd, '--ns', $ns; } + if (-e $keyfile) { + $self->loginfo("enabling encryption"); + push @$cmd, '--keyfile', $keyfile; + if (defined($master_keyfile)) { + if (-e $master_keyfile) { + $self->loginfo("enabling master key feature"); + push @$cmd, '--master-pubkey-file', $master_keyfile; + } elsif ($scfg->{'master-pubkey'}) { + die "master public key configured but no key file found\n"; + } + } + } else { + my $encryption_fp = $scfg->{'encryption-key'}; + die "encryption configured ('$encryption_fp') but no encryption key file found!\n" + if $encryption_fp; + $self->loginfo("WARNING: backup target is configured with master key, but this backup is not encrypted - master key settings will be ignored!") + if defined($master_keyfile) && -e $master_keyfile; + } push @$cmd, "qemu-server.conf:$conffile"; push @$cmd, "fw.conf:$firewall" if -e $firewall;