]> git.proxmox.com Git - pve-container.git/commitdiff
vzdump: always add (empty) firewall config
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Thu, 25 Jul 2019 12:40:41 +0000 (14:40 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Fri, 26 Jul 2019 06:58:06 +0000 (08:58 +0200)
just like we always add the container config

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
(cherry picked from commit d1671a80d5846fde9905e175a62903d346d2a1d1)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
src/PVE/VZDump/LXC.pm

index ae793dcdd5fd052e78f998b3dc63f56cfa114dbf..4ebfc1e173f8f2dd69e6b3c0556c7b32463b97ed 100644 (file)
@@ -289,10 +289,13 @@ sub assemble {
     PVE::Tools::file_set_contents("$tmpdir/etc/vzdump/pct.conf", PVE::LXC::Config::write_pct_config("/lxc/$vmid.conf", $conf));
 
     my $firewall ="/etc/pve/firewall/$vmid.fw";
+    my $fwconftmp = "$tmpdir/etc/vzdump/pct.fw";
     if (-e  $firewall) {
-       PVE::Tools::file_copy($firewall, "$tmpdir/etc/vzdump/pct.fw");
-       $task->{fw} = 1;
+       PVE::Tools::file_copy($firewall, $fwconftmp);
+    } else {
+       PVE::Tools::file_set_contents($fwconftmp, '');
     }
+    $task->{fw} = 1;
 }
 
 sub archive {