proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-01 21:01:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix cdrom permission check

Browse Source
This commit is contained in:
Dietmar Maurer 2012-02-20 07:17:10 +01:00
parent 49f9db93c0
commit f5782fd0ad
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=qemu-server PACKAGE=qemu-server
PKGREL=17 PKGREL=18
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

4
PVE/API2/Qemu.pm
View File

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

6
changelog.Debian
View File

@ -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 qemu-server (2.0-17) unstable; urgency=low
* fix cdrom removal bug * fix cdrom removal bug