[pve-devel] r6191 - vzdump/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-28 12:14:52 +0200 (Tue, 28 Jun 2011)
New Revision: 6191

Modified:
   vzdump/trunk/ChangeLog
   vzdump/trunk/Makefile
   vzdump/trunk/OpenVZ.pm
   vzdump/trunk/changelog.Debian
   vzdump/trunk/control.in
Log:


Modified: vzdump/trunk/ChangeLog
===================================================================
--- vzdump/trunk/ChangeLog	2011-06-28 08:26:01 UTC (rev 6190)
+++ vzdump/trunk/ChangeLog	2011-06-28 10:14:52 UTC (rev 6191)
@@ -1,3 +1,8 @@
+2011-06-28  Proxmox Support Team  <support at proxmox.com>
+
+	* OpenVZ.pm (*_vm): add --skiplock flag again (problem fixe in
+	newer versions of vzctl.
+
 2011-05-24  Proxmox Support Team  <support at proxmox.com>
 
 	* OpenVZ.pm (resume_vm): remove --skiplock flag

Modified: vzdump/trunk/Makefile
===================================================================
--- vzdump/trunk/Makefile	2011-06-28 08:26:01 UTC (rev 6190)
+++ vzdump/trunk/Makefile	2011-06-28 10:14:52 UTC (rev 6191)
@@ -13,7 +13,7 @@
 
 VERSION=1.2
 PACKAGE=vzdump
-PKGREL=13
+PKGREL=14
 
 #ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 #RPMARCH:=$(shell rpm --eval %_build_arch)

Modified: vzdump/trunk/OpenVZ.pm
===================================================================
--- vzdump/trunk/OpenVZ.pm	2011-06-28 08:26:01 UTC (rev 6190)
+++ vzdump/trunk/OpenVZ.pm	2011-06-28 10:14:52 UTC (rev 6191)
@@ -261,19 +261,19 @@
 sub stop_vm {
     my ($self, $task, $vmid) = @_;
 
-    $self->cmd ("vzctl stop $vmid");
+    $self->cmd ("vzctl --skiplock stop $vmid");
 }
 
 sub start_vm {
     my ($self, $task, $vmid) = @_;
 
-    $self->cmd ("vzctl start $vmid");
+    $self->cmd ("vzctl --skiplock start $vmid");
 }
 
 sub suspend_vm {
     my ($self, $task, $vmid) = @_;
 
-    $self->cmd ("vzctl chkpnt $vmid --suspend");
+    $self->cmd ("vzctl --skiplock chkpnt $vmid --suspend");
 }
 
 sub snapshot {
@@ -316,7 +316,7 @@
 sub resume_vm {
     my ($self, $task, $vmid) = @_;
 
-    $self->cmd ("vzctl chkpnt $vmid --resume");
+    $self->cmd ("vzctl --skiplock chkpnt $vmid --resume");
 }
 
 sub assemble {

Modified: vzdump/trunk/changelog.Debian
===================================================================
--- vzdump/trunk/changelog.Debian	2011-06-28 08:26:01 UTC (rev 6190)
+++ vzdump/trunk/changelog.Debian	2011-06-28 10:14:52 UTC (rev 6191)
@@ -1,3 +1,9 @@
+vzdump (1.2-14) unstable; urgency=low
+
+  * add --skiplock flag agian, depend on newer vzctl
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 28 Jun 2011 12:05:11 +0200
+
 vzdump (1.2-13) unstable; urgency=low
 
   * remove OpenVZ --skiplock flag

Modified: vzdump/trunk/control.in
===================================================================
--- vzdump/trunk/control.in	2011-06-28 08:26:01 UTC (rev 6190)
+++ vzdump/trunk/control.in	2011-06-28 10:14:52 UTC (rev 6191)
@@ -3,7 +3,7 @@
 Section: admin
 Priority: optional
 Architecture: @@ARCH@@
-Depends: perl (>= 5.6.0-16), vzctl, cstream, rsync, liblockfile-simple-perl, exim4 | mail-transport-agent
+Depends: perl (>= 5.6.0-16), vzctl (>= 3.0.28), cstream, rsync, liblockfile-simple-perl, exim4 | mail-transport-agent
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Description: OpenVZ backup scripts
  This package contains the vzdump script to backup and restore openvz images.