Create firewall dir on VM restore

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index d10e1e50021be57f21342fa2c86f426eb1dd3c42..03da74756de64d49253c4a04b0d18b5d5c564ad5 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5476,8 +5476,11 @@ sub restore_vma_archive {
            "unable to read qemu-server.conf - $!\n";
 
        my $fwcfgfn = "$tmpdir/qemu-server.fw";
-       PVE::Tools::file_copy($fwcfgfn, "/etc/pve/firewall/$vmid.fw")
-           if -f $fwcfgfn;
+       if (-f $fwcfgfn) {
+           my $pve_firewall_dir = '/etc/pve/firewall';
+           mkdir $pve_firewall_dir; # make sure the dir exists
+           PVE::Tools::file_copy($fwcfgfn, "${pve_firewall_dir}/$vmid.fw");
+       }
 
        while (defined(my $line = <$fh>)) {
            if ($line =~ m/^\#qmdump\#map:(\S+):(\S+):(\S*):(\S*):$/) {

diff --git a/changelog.Debian b/changelog.Debian
index a4b6bf8563d7b8340796298f3e2af18bc3a7146b..3cbdc50f0a1e8225bd0f50d538a6dbb57cb3d554 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -4,6 +4,8 @@ qemu-server (4.0-50) unstable; urgency=medium
 
   * fix PVE::HA use clause so HA resources get registered
 
+  * Create firewall dir on VM restore
+
  -- Proxmox Support Team <support@proxmox.com>  Tue, 26 Jan 2016 16:57:43 +0100
 
 qemu-server (4.0-49) unstable; urgency=medium