From f5782fd0adebf46cb2021cdf3ab2e15c674090df Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 20 Feb 2012 07:17:10 +0100
Subject: [PATCH] fix cdrom permission check

---
 Makefile         | 2 +-
 PVE/API2/Qemu.pm | 4 +++-
 changelog.Debian | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1193544..1c0ef3b 100644
--- 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 66fcd44..789b851 100644
--- 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 04df73e..7d0fef0 100644
--- 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
-- 
2.39.2