diff --git a/Makefile b/Makefile index 52a6ce1c..4ead0b00 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=qemu-server -PKGREL=4 +PKGREL=5 DESTDIR= PREFIX=/usr diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 3c294de9..22d63b88 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -193,7 +193,7 @@ sub stop_vm { my $wait = $opts->{stopwait} * 60; # send shutdown and wait - $self->cmd ("qm shutdown $vmid --skiplock && qm wait $vmid $wait"); + $self->cmd ("qm shutdown $vmid --skiplock && qm wait $vmid --timeout $wait"); } sub start_vm { diff --git a/changelog.Debian b/changelog.Debian index 075e55d6..7e98a930 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +qemu-server (2.0-5) unstable; urgency=low + + * fix vzdump stop mode + + -- Proxmox Support Team Mon, 21 Nov 2011 06:38:03 +0100 + qemu-server (2.0-4) unstable; urgency=low * bump version