* [pve-devel] [PATCH container] restore: fix fw.conf restore for PBS
@ 2020-12-07 8:18 Fabian Grünbichler
2020-12-07 8:29 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Grünbichler @ 2020-12-07 8:18 UTC (permalink / raw)
To: pve-devel
the 'files' command returns a list of hashes, and the filename is
'fw.conf.blob' not 'fw.conf'.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Tested with container with and without firewall config.
src/PVE/LXC/Create.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index 39902a2..5c64566 100644
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -280,7 +280,7 @@ sub restore_configuration_from_proxmox_backup {
my $cmd = "files";
my $list = PVE::Storage::PBSPlugin::run_client_cmd($scfg, $storeid, "files", [$name]);
- my $has_fw_conf = grep { $_ eq 'fw.conf' } @$list;
+ my $has_fw_conf = grep { $_->{filename} eq 'fw.conf.blob' } @$list;
if ($has_fw_conf) {
my $pve_firewall_dir = '/etc/pve/firewall';
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH container] restore: fix fw.conf restore for PBS
2020-12-07 8:18 [pve-devel] [PATCH container] restore: fix fw.conf restore for PBS Fabian Grünbichler
@ 2020-12-07 8:29 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2020-12-07 8:29 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
On 07.12.20 09:18, Fabian Grünbichler wrote:
> the 'files' command returns a list of hashes, and the filename is
> 'fw.conf.blob' not 'fw.conf'.
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> Tested with container with and without firewall config.
>
> src/PVE/LXC/Create.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 8:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-07 8:18 [pve-devel] [PATCH container] restore: fix fw.conf restore for PBS Fabian Grünbichler
2020-12-07 8:29 ` [pve-devel] applied: " Thomas Lamprecht
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