proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-28 08:53:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

support new qemu vma backup files

Browse Source 
bump version to 2.3-1
This commit is contained in:
Dietmar Maurer 2012-12-13 12:55:09 +01:00
parent ae60540eb1
commit 757fd3d5b9
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/VZDump.pm
View File

@ -672,7 +672,7 @@ sub get_backup_file_list {
my $bklist = []; my $bklist = [];
foreach my $fn (<$dir/${bkname}-*>) { foreach my $fn (<$dir/${bkname}-*>) {
next if $exclude_fn && $fn eq $exclude_fn; next if $exclude_fn && $fn eq $exclude_fn;
if ($fn =~ m!/(${bkname}-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?)))$!) { if ($fn =~ m!/(${bkname}-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?)))$!) {
$fn = "$dir/$1"; # untaint $fn = "$dir/$1"; # untaint
my $t = timelocal ($7, $6, $5, $4, $3 - 1, $2 - 1900); my $t = timelocal ($7, $6, $5, $4, $3 - 1, $2 - 1900);
push @$bklist, [$fn, $t]; push @$bklist, [$fn, $t];
@ -722,7 +722,7 @@ sub exec_backup_task {
my $logfile = $task->{logfile} = "$opts->{dumpdir}/$basename.log"; my $logfile = $task->{logfile} = "$opts->{dumpdir}/$basename.log";
my $ext = '.tar'; my $ext = $vmtype eq 'qemu' ? '.vma' : '.tar';
my ($comp, $comp_ext) = compressor_info($opts->{compress}); my ($comp, $comp_ext) = compressor_info($opts->{compress});
if ($comp && $comp_ext) { if ($comp && $comp_ext) {
$ext .= ".${comp_ext}"; $ext .= ".${comp_ext}";
@ -916,7 +916,7 @@ sub exec_backup_task {
debugmsg ('info', "delete old backup '$d->[0]'", $logfd); debugmsg ('info', "delete old backup '$d->[0]'", $logfd);
unlink $d->[0]; unlink $d->[0];
my $logfn = $d->[0]; my $logfn = $d->[0];
$logfn =~ s/\.(tgz|(tar(\.(gz|lzo))?))$/\.log/; $logfn =~ s/\.(tgz|((tar|vma)(\.(gz|lzo))?))$/\.log/;
unlink $logfn; unlink $logfn;
} }
} }
@ -946,8 +946,11 @@ sub exec_backup_task {
debugmsg ('info', "resume vm", $logfd); debugmsg ('info', "resume vm", $logfd);
$plugin->resume_vm ($task, $vmid); $plugin->resume_vm ($task, $vmid);
} else { } else {
debugmsg ('info', "restarting vm", $logfd); my $running = $plugin->vm_status($vmid);
$plugin->start_vm ($task, $vmid); if (!$running) {
debugmsg ('info', "restarting vm", $logfd);
$plugin->start_vm ($task, $vmid);
}
} }
}; };
my $err = $@; my $err = $@;

6
bin/vzdump
View File

@ -52,7 +52,7 @@ vzdump - backup utility for virtual machine
=head1 DESCRIPTION =head1 DESCRIPTION
vzdump is an utility to make consistent snapshots of running virtual vzdump is an utility to make consistent snapshots of running virtual
machines (VMs). It basically creates a tar archive of the VM private area, machines (VMs). It basically creates an archive of the VM private area,
which also includes the VM configuration files. vzdump currently which also includes the VM configuration files. vzdump currently
supports OpenVZ and QemuServer VMs. supports OpenVZ and QemuServer VMs.
@ -96,7 +96,7 @@ number of backups to keep.
=head1 RESTORE =head1 RESTORE
The resulting tar files can be restored with the following programs. The resulting archive files can be restored with the following programs.
=over 1 =over 1
@ -182,7 +182,7 @@ Restore an OpenVZ machine to VM 600
Restore an Qemu/KVM machine to VM 601 Restore an Qemu/KVM machine to VM 601
# qmrestore /mnt/backup/vzdump-qemu-888.tar 601 # qmrestore /mnt/backup/vzdump-qemu-888.vma 601
Clone an existing container 101 to container 300 using pipes Clone an existing container 101 to container 300 using pipes

6
debian/changelog.Debian vendored
View File

@ -1,3 +1,9 @@
pve-manager (2.3-1) unstable; urgency=low
* support new qemu vma backup files
-- Proxmox Support Team <support@proxmox.com> Thu, 13 Dec 2012 07:27:32 +0100
pve-manager (2.2-32) unstable; urgency=low pve-manager (2.2-32) unstable; urgency=low
* add new cpu types: Haswell and Opteron_G5 * add new cpu types: Haswell and Opteron_G5

6
defines.mk
View File

@ -1,8 +1,8 @@
RELEASE=2.2 RELEASE=2.3
VERSION=2.2 VERSION=2.3
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=32 PACKAGERELEASE=1
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5