clone_vm: rework firewall config cloning

[pve-container.git] / src / PVE / API2 / LXC.pm

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 4877dd95e08e0dc8c64d32c3638b0e3320a736f6..0d4d91a24c29d163991aa4e187d529eb0e4a13db 100644 (file)
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -1394,6 +1394,7 @@ __PACKAGE__->register_method({
        my $running;
 
        PVE::LXC::Config->create_and_lock_config($newid, 0);
+       PVE::Firewall::clone_vmfw_conf($vmid, $newid);
 
        my $lock_and_reload = sub {
            my ($vmid, $code) = @_;
@@ -1502,6 +1503,7 @@ __PACKAGE__->register_method({
            eval {
                $lock_and_reload->($newid, sub {
                    PVE::LXC::Config->destroy_config($newid);
+                   PVE::Firewall::remove_vmfw_conf($newid);
                });
            };
            warn "Failed to remove target CT config - $@\n" if $@;
@@ -1593,6 +1595,7 @@ __PACKAGE__->register_method({
                eval {
                    $lock_and_reload->($newid, sub {
                        PVE::LXC::Config->destroy_config($newid);
+                       PVE::Firewall::remove_vmfw_conf($newid);
                    });
                };
                warn "Failed to remove target CT config - $@\n" if $@;
@@ -1612,7 +1615,6 @@ __PACKAGE__->register_method({
                }
            });
 
-           PVE::Firewall::clone_vmfw_conf($vmid, $newid);
            return;
        };