restore: also remove firewall config after failed restore

Before, a failed restore would only remove the container config, but
the firewall config would remain.
Now, the firewall config is also removed, except for the case when the
user only has the VM.Backup permission. In this case the firewall
would not have been restored/changed by us and is left as is.

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index f2113deff7de611fa779530d56e4a6e1abbde738..50c9eaf34d6455b2c55d0a35b6a062626c618900 100644 (file)
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -499,6 +499,11 @@ __PACKAGE__->register_method({
                if ($destroy_config_on_error) {
                    eval { PVE::LXC::Config->destroy_config($vmid) };
                    warn $@ if $@;
+
+                   if (!$skip_fw_config_restore) { # Only if user has permission to change the fw
+                       PVE::Firewall::remove_vmfw_conf($vmid);
+                       warn $@ if $@;
+                   }
                }
                die "$emsg $err";
            }