From 503e96f8de8872bf5effba5bd58a6c5a71675a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 20 Jul 2020 10:26:21 +0200 Subject: [PATCH] fix #2857: restore: pass keyfile to pbs-restore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit if configured. otherwise restoring encrypted backups will be quite hard.. Signed-off-by: Fabian Grünbichler --- PVE/QemuServer.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 809124c3..0a09f3a7 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5937,6 +5937,7 @@ sub restore_proxmox_backup_archive { my $datastore = $scfg->{datastore}; my $username = $scfg->{username} // 'root@pam'; my $fingerprint = $scfg->{fingerprint}; + my $keyfile = PVE::Storage::PBSPlugin::pbs_encryption_key_file_name($storecfg, $storeid); my $repo = "$username\@$server:$datastore"; @@ -6054,6 +6055,7 @@ sub restore_proxmox_backup_archive { ]; push @$pbs_restore_cmd, '--format', $d->{format} if $d->{format}; + push @$pbs_restore_cmd, '--keyfile', $keyfile if -e $keyfile; if (PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $volid)) { push @$pbs_restore_cmd, '--skip-zero';