fix bug #134: allow to pass file names to qmrestore and 'qm set'

diff --git a/Makefile b/Makefile
index 9995b9392f637c03aa3952426d3ccb33176f00b6..528851666fe8cbdd3b02ee42748eb5fe39c6ffed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=34
+PKGREL=35
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 91d9439e331a4098127eb9b56576ce0d83d56e65..50403ffdf249eeb5f524bb47727d24b6929aada9 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -86,7 +86,8 @@ my $create_disks = sub {
            $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
        } else {
            my $path = $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $volid);
-           PVE::Storage::activate_volumes($storecfg, [ $volid ]);
+           PVE::Storage::activate_volumes($storecfg, [ $volid ])
+               if PVE::Storage::parse_volume_id ($volid, 1);
            die "image '$path' does not exists\n" if (!(-f $path || -b $path));
            $res->{$ds} = $settings->{$ds};
        }
@@ -298,10 +299,13 @@ __PACKAGE__->register_method({
 
            if ($archive eq '-') {
                die "pipe requires cli environment\n"
-                   && $rpcenv->{type} ne 'cli';
+                   if $rpcenv->{type} ne 'cli';
            } else {
                my $path = $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $archive);
-               PVE::Storage::activate_volumes($storecfg, [ $archive ]);
+
+               PVE::Storage::activate_volumes($storecfg, [ $archive ])
+                   if PVE::Storage::parse_volume_id ($archive, 1);
+
                die "can't find archive file '$archive'\n" if !($path && -f $path);
                $archive = $path;
            }

diff --git a/changelog.Debian b/changelog.Debian
index ad909db1131a239ec711f2e24a7cd9d588bf5960..a4e4f3c2723bc421b4bfcdb0cc2cae53a2434984 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-35) unstable; urgency=low
+
+  * fix bug #134: allow to pass file names to qmrestore and 'qm set'
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Apr 2012 10:51:41 +0200
+
 qemu-server (2.0-34) unstable; urgency=low
 
   * fix bug #12: check storage availability early (migrate)