--- vzdump-1.2.6.orig/Makefile +++ vzdump-1.2.6/Makefile @@ -63,7 +63,7 @@ OpenVZ.pm \ control -all: ${TGZ} ${DEB} ${RPM} +all: control: control.in sed -e s/@@ARCH@@/${ARCH}/ -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ <$< >$@ @@ -134,4 +134,4 @@ .PHONY: clean clean: - rm -rf debian *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR} \ No newline at end of file + rm -rf *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR} \ No newline at end of file --- vzdump-1.2.6.orig/OpenVZ.pm +++ vzdump-1.2.6/OpenVZ.pm @@ -48,9 +48,9 @@ local $/; my $res = { - rootdir => '/vz/root/$VEID', # note '$VEID' is a place holder - privatedir => '/vz/private/$VEID', # note '$VEID' is a place holder - dumpdir => '/vz/dump', + rootdir => '/var/lib/vz/root/$VEID', # note '$VEID' is a place holder + privatedir => '/var/lib/vz/private/$VEID', # note '$VEID' is a place holder + dumpdir => '/var/lib/vz/dump', lockdir => '/var/lib/vz/lock', }; @@ -232,7 +232,7 @@ sub lock_vm { my ($self, $vmid) = @_; - my $filename = "$self->{lockdir}/103.lck"; + my $filename = "$self->{lockdir}/$vmid.lck"; my $lockmgr = LockFile::Simple->make(-format => '%f', -autoclean => 1, --- vzdump-1.2.6.orig/VZDump.pm +++ vzdump-1.2.6/VZDump.pm @@ -616,10 +616,10 @@ my $devmapper; - my $cmd = "lvs --units m --separator ':' --noheadings -o vg_name,lv_name,lv_size"; + my $cmd = "lvs --units M --separator ':' --noheadings -o vg_name,lv_name,lv_size"; if (my $fd = IO::File->new ("$cmd 2>/dev/null|")) { while (my $line = <$fd>) { - if ($line =~ m|^\s*(\S+):(\S+):(\d+(\.\d+))M$|) { + if ($line =~ m|^\s*(\S+):(\S+):(\d+([\.,]\d+))[mM]$|) { my $vg = $1; my $lv = $2; $devmapper->{"/dev/$vg/$lv"} = [$vg, $lv]; --- vzdump-1.2.6.orig/debian/README.Debian +++ vzdump-1.2.6/debian/README.Debian @@ -0,0 +1,9 @@ +vzdump for Debian +----------------- + +Changed default vz directory from /vz to /var/lib/vz to be compliant with +the Debian version of vzctl and to be FHS compliant. + +Also the vzdump utility is located in /usr/sbin instead of /usr/bin. + + -- Ola Lundqvist Mon, 06 Apr 2009 20:39:07 +0200 --- vzdump-1.2.6.orig/debian/changelog +++ vzdump-1.2.6/debian/changelog @@ -0,0 +1,100 @@ +vzdump (1.2.6-4) unstable; urgency=low + + * Simplified rules file significantly. + * Updated to debhelper compatibility 9. + + -- Ola Lundqvist Sun, 11 Sep 2016 22:15:49 +0200 + +vzdump (1.2.6-3) unstable; urgency=low + + * Correction to make it work also with LVM snapshots. Closes: #666064. + Thanks to Martin Pircher for the report + and patch. + * Updated to standards version 3.9.1. + * Changed from dh_clean -k to dh_prep. + + -- Ola Lundqvist Sat, 07 Apr 2012 14:36:48 +0200 + +vzdump (1.2.6-2) unstable; urgency=low + + * CTID is no longer hardcoded in OpenVZ.pm. Closes: #645727. Thanks to + Jakov Curic for the patch. + + -- Ola Lundqvist Tue, 18 Oct 2011 08:00:30 +0200 + +vzdump (1.2.6-1) unstable; urgency=low + + * New upstream release. + * Applied patch from Patrick Ringl that solves a + problem with LVM2 detection. Closes: #587407. + + -- Ola Lundqvist Thu, 22 Jul 2010 21:33:07 +0200 + +vzdump (1.2.4-2) unstable; urgency=low + + * URL in watch file and control file updated. + * Dependencies updated to reflect the need in the rewritten package. + + -- Ola Lundqvist Tue, 10 Nov 2009 07:24:04 +0100 + +vzdump (1.2.4-1) unstable; urgency=low + + * New upstream release. + This is a complete rewrite of the software according to upstream. + The upstream version is called 1.2-4. + + -- Ola Lundqvist Sat, 07 Nov 2009 14:02:48 +0100 + +vzdump (1.0-3) unstable; urgency=low + + * Initial release (Closes: #503147) + + -- Ola Lundqvist Mon, 06 Apr 2009 20:39:07 +0200 + +vzdump (1.0-2) unstable; urgency=low + + * bug fix in config parser + + -- Proxmox Support Team Thu, 28 Jun 2007 11:38:06 +0200 + +vzdump (1.0-1) stable; urgency=low + + * set version number to 1.0, because we are quite stable + + * added copyright notice to man page + + -- Proxmox Support Team Thu, 10 May 2007 09:50:01 +0200 + +vzdump (0.4-1) unstable; urgency=low + + * also read config of VEs with ID > 999 + + -- Proxmox Support Team Mon, 26 Mar 2007 09:05:28 +0200 + +vzdump (0.3-1) unstable; urgency=low + + * merged in patch from Kir Kolyshkin (rpm related changes) + + -- Proxmox Support Team Thu, 22 Mar 2007 08:35:55 +0100 + +vzdump (0.2-2) unstable; urgency=low + + * changed package dependency (perl > 5.6.0-16, vzdump) + + -- Proxmox Support Team Wed, 21 Mar 2007 10:42:10 +0100 + +vzdump (0.2-1) stable; urgency=low + + * dm2 snapshot support + + * many bug fixes + + * new manual page + + -- Proxmox Support Team Mon, 19 Mar 2007 11:10:25 +0100 + +vzdump (0.1-1) stable; urgency=low + + * first release + + -- Proxmox Support Team Wed, 7 Mar 2007 16:20:48 +0100 --- vzdump-1.2.6.orig/debian/compat +++ vzdump-1.2.6/debian/compat @@ -0,0 +1 @@ +9 --- vzdump-1.2.6.orig/debian/control +++ vzdump-1.2.6/debian/control @@ -0,0 +1,14 @@ +Source: vzdump +Section: admin +Priority: extra +Maintainer: Ola Lundqvist +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.1 +Homepage: http://www.proxmox.com/cms_proxmox/en/virtualization/openvz/vzdump/ + +Package: vzdump +Architecture: all +Depends: perl, vzctl, cstream, rsync, liblockfile-simple-perl, exim4 | mail-transport-agent, ${shlibs:Depends}, ${misc:Depends} +Suggests: xdelta +Description: OpenVZ backup scripts + This package contains the vzdump script to backup and restore openvz images. --- vzdump-1.2.6.orig/debian/copyright +++ vzdump-1.2.6/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Ola Lundqvist on +Mon, 06 Apr 2009 20:39:07 +0200. + +It was downloaded from + ftp://pve.proxmox.com/sources + http://www.proxmox.com/cms_proxmox/en/virtualization/openvz/vzdump/ + +Upstream Author: + + Proxmox Server Solutions GmbH + +Copyright: + + Copyright (C) 2007-2009 Proxmox Server Solutions GmbH + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2009, Ola Lundqvist and +is licensed under the GPL, see above. --- vzdump-1.2.6.orig/debian/dirs +++ vzdump-1.2.6/debian/dirs @@ -0,0 +1 @@ +usr/sbin --- vzdump-1.2.6.orig/debian/docs +++ vzdump-1.2.6/debian/docs @@ -0,0 +1 @@ +TODO --- vzdump-1.2.6.orig/debian/patches/lvm_mapping_fix.patch +++ vzdump-1.2.6/debian/patches/lvm_mapping_fix.patch @@ -0,0 +1,11 @@ +--- /usr/share/perl5/PVE/VZDump-old.pm 2010-06-28 11:15:10.000000000 +0000 ++++ /usr/share/perl5/PVE/VZDump.pm 2010-06-28 11:15:35.000000000 +0000 +@@ -616,7 +616,7 @@ + + my $devmapper; + +- my $cmd = "lvs --units m --separator ':' --noheadings -o vg_name,lv_name,lv_size"; ++ my $cmd = "lvs --units M --separator ':' --noheadings -o vg_name,lv_name,lv_size"; + if (my $fd = IO::File->new ("$cmd 2>/dev/null|")) { + while (my $line = <$fd>) { + if ($line =~ m|^\s*(\S+):(\S+):(\d+(\.\d+))M$|) { --- vzdump-1.2.6.orig/debian/rules +++ vzdump-1.2.6/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ --- vzdump-1.2.6.orig/debian/watch +++ vzdump-1.2.6/debian/watch @@ -0,0 +1,11 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +http://www.proxmox.com/cms_proxmox/en/virtualization/openvz/vzdump/ vzdump-(.*)\.tar\.gz