yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow multiple content types

Browse Source
This commit is contained in:
Dietmar Maurer
2011-10-20 08:02:52 +02:00
parent 568de3d125
commit 6a4d7398b3
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Storage.pm
View File

@ -397,12 +397,9 @@ sub check_type {
$res->{$c} = 1; $res->{$c} = 1;
} }
# only local storage may have several content types if ($res->{none} && scalar (keys %$res) > 1) {
if ($res->{none} || !($storeid && $storeid eq 'local')) {
if (scalar (keys %$res) > 1) {
return undef if $noerr; return undef if $noerr;
die "storage does not support multiple content types\n"; die "unable to combine 'none' with other content types\n";
}
} }
return $res; return $res;
@ -733,7 +730,7 @@ sub get_iso_dir {
my ($cfg, $storeid) = @_; my ($cfg, $storeid) = @_;
my $isodir = $cfg->{ids}->{$storeid}->{path}; my $isodir = $cfg->{ids}->{$storeid}->{path};
$isodir .= '/template/iso' if $storeid eq 'local'; $isodir .= '/template/iso';
return $isodir; return $isodir;
} }
@ -742,7 +739,7 @@ sub get_vztmpl_dir {
my ($cfg, $storeid) = @_; my ($cfg, $storeid) = @_;
my $tmpldir = $cfg->{ids}->{$storeid}->{path}; my $tmpldir = $cfg->{ids}->{$storeid}->{path};
$tmpldir .= '/template/cache' if $storeid eq 'local'; $tmpldir .= '/template/cache';
return $tmpldir; return $tmpldir;
} }
@ -751,7 +748,7 @@ sub get_backup_dir {
my ($cfg, $storeid) = @_; my ($cfg, $storeid) = @_;
my $dir = $cfg->{ids}->{$storeid}->{path}; my $dir = $cfg->{ids}->{$storeid}->{path};
$dir .= '/dump' if $storeid eq 'local'; $dir .= '/dump';
return $dir; return $dir;
} }