fix bug #840: vzdump - fix compression command pipe

bump version to 1.0-33

$comp is a command string and needs to be split. The set of
possible commands is limited and known so splitting by
/\s+/ (as suggested by Marc Cousin) should be safe enough.

diff --git a/Makefile b/Makefile
index 314682738e0146b63ce8d54533c2a42d3d697a6f..d23e39cc8dfed7e6e1bbc7a96311d5b6850b2780 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.1
 
 VERSION=1.0
 PACKAGE=pve-container
-PKGREL=32
+PKGREL=33
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 

diff --git a/debian/changelog b/debian/changelog
index 15d9b2a2d7887d9f663c69ebce32bdc01e19c8fb..4521c312f68b26edaae43af851d3216dff7280f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-container (1.0-33) unstable; urgency=medium
+
+  * fix bug #840: vzdump - fix compression command pipe
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 14 Dec 2015 08:48:16 +0100
+
 pve-container (1.0-32) unstable; urgency=medium
 
   * Revert "Mounting of zfspool snapshots are not necessary."

diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 6d50ca253b405d9fdde82f98ff6eab21533df5a7..5d25a7d8bafc8d749f34cf377e49e797652f5b32 100644 (file)
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -326,7 +326,7 @@ sub archive {
 
     my $bwl = $opts->{bwlimit}*1024; # bandwidth limit for cstream
     push @$cmd, [ 'cstream', '-t', $bwl ] if $opts->{bwlimit};
-    push @$cmd, [ $comp ] if $comp;
+    push @$cmd, [ split(/\s+/, $comp) ] if $comp;
 
     if ($opts->{stdout}) {
        push @{$cmd->[-1]}, \(">&" . fileno($opts->{stdout}));