fix cdrom permission check

diff --git a/Makefile b/Makefile
index 1193544dccdc981d2cea2f81b533f189084af191..1c0ef3bce408ee94e765b2613b636d0edbf965cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=17
+PKGREL=18
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 66fcd4446c0972eba11064a96c7058d7125d75c9..789b851a2b25550baa01fb34061b38043c386ff2 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -46,6 +46,8 @@ my $check_storage_access = sub {
 
        if (!$volid || $volid eq 'none') {
            # nothing to check
+       } elsif ($isCDROM && ($volid eq 'cdrom')) {
+           $rpcenv->check($authuser, "/", ['Sys.Console']);
        } elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) {
            my ($storeid, $size) = ($2 || $default_storage, $3);
            die "no storage ID specified (and no default storage)\n" if !$storeid;
@@ -70,7 +72,7 @@ my $create_disks = sub {
 
        my $volid = $disk->{file};
 
-       if (!$volid || $volid eq 'none') {
+       if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
            $res->{$ds} = $settings->{$ds};
        } elsif ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) {
            my ($storeid, $size) = ($2 || $default_storage, $3);

diff --git a/changelog.Debian b/changelog.Debian
index 04df73e5106b2effefb01c29f0cf75979959b5f5..7d0fef03c49f48282e3292850ad37f14e5b49536 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-18) unstable; urgency=low
+
+  * fix cdrom (/dev/cdrom) permission check
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 20 Feb 2012 07:16:36 +0100
+
 qemu-server (2.0-17) unstable; urgency=low
 
   * fix cdrom removal bug