mirror of
git://git.proxmox.com/git/qemu-server.git
synced 2025-02-02 09:47:13 +03:00
fix cdrom permission check
This commit is contained in:
parent
49f9db93c0
commit
f5782fd0ad
2
Makefile
2
Makefile
@ -2,7 +2,7 @@ RELEASE=2.0
|
||||
|
||||
VERSION=2.0
|
||||
PACKAGE=qemu-server
|
||||
PKGREL=17
|
||||
PKGREL=18
|
||||
|
||||
DESTDIR=
|
||||
PREFIX=/usr
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user