From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 1 Sep 2015 07:59:55 +0000 (+0200)
Subject: fixed call for cfg file and error when CT is running and on local storage
X-Git-Url: https://git.proxmox.com/?p=pve-container.git;a=commitdiff_plain;h=e4f9a7aff22fa8974a5e5ad397f7409b0bfc700d

fixed call for cfg file and error when CT is running and on local storage

When trying to migrate only throw an error when the CT is on an non
shared storage AND running.
Also fixed an remaining PVE::OpenVZ call to LXC.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index 771174e..bf6d701 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -51,7 +51,7 @@ sub prepare {
 	PVE::Storage::storage_check_node($self->{storecfg}, $storage, $self->{node});
 
 	die "unable to migrate local mountpoint '$volid' while CT is running"
-	    if !$scfg->{shared};
+	    if !$scfg->{shared} && $running;
 
     });
 
@@ -100,8 +100,8 @@ sub phase1 {
 	}
     });
 
-    my $conffile = PVE::OpenVZ::config_file($vmid);
-    my $newconffile = PVE::OpenVZ::config_file($vmid, $self->{node});
+    my $conffile = PVE::LXC::config_file($vmid);
+    my $newconffile = PVE::LXC::config_file($vmid, $self->{node});
 
     if ($self->{running}) {
 	die "implement me";