fix tar restore: correctly check if VM config already exists

diff --git a/Makefile b/Makefile
index a66fdd6dc838ba63a86dafa655e5fe4437cc86df..cc26856d66bb4c2249f0dc768a4855b5a5c55158 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 VERSION=2.3
 PACKAGE=qemu-server
-PKGREL=7
+PKGREL=8
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 89aa1798456ebc982c002aabbe5cb80f827f10f7..20a6dfdf1e9d510fa478bd50532b02512cfe6c06 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3874,8 +3874,10 @@ sub restore_tar_archive {
     }
 
     my $storecfg = cfs_read_file('storage.cfg');
+
     # destroy existing data - keep empty config
-    destroy_vm($storecfg, $vmid, 1);
+    my $vmcfgfn = PVE::QemuServer::config_file($vmid);
+    destroy_vm($storecfg, $vmid, 1) if -f $vmcfgfn;
 
     my $tocmd = "/usr/lib/qemu-server/qmextract";
 

diff --git a/changelog.Debian b/changelog.Debian
index f54c23b08feea2c34ef5c291c4644f047d16fa58..4142ed3cd4932c22a69faf10b6a19ce55ef982d3 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.3-8) unstable; urgency=low
+
+  * fix tar restore: correctly check if VM config already exists
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Jan 2013 09:53:12 +0100
+
 qemu-server (2.3-7) unstable; urgency=low
 
   * allow to suspend/resume VM during backup