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

content-dirs: check that all content dirs are pairwise inequal

Browse Source 
This prevents strange interactions in case the same content directory
is used for multiple content types.

Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
This commit is contained in:
Friedrich Weber
2023-03-21 18:03:25 +01:00
committed by Thomas Lamprecht
parent 49add58c4f
commit 5f4b5bd11c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/PVE/Storage/Plugin.pm
View File

@ -3,6 +3,7 @@ package PVE::Storage::Plugin;
use strict; use strict;
use warnings; use warnings;
use Cwd qw(abs_path);
use Encode qw(decode); use Encode qw(decode);
use Fcntl ':mode'; use Fcntl ':mode';
use File::chdir; use File::chdir;
@ -1365,6 +1366,17 @@ sub activate_storage {
warn "${storeid}: 'mkdir' option is deprecated. Use 'create-base-path' or 'create-subdirs' instead.\n" warn "${storeid}: 'mkdir' option is deprecated. Use 'create-base-path' or 'create-subdirs' instead.\n"
if defined($scfg->{mkdir}); if defined($scfg->{mkdir});
# check that content dirs are pairwise inequal
my $resolved_subdirs = {};
if (defined($scfg->{content})) {
foreach my $vtype (keys $scfg->{content}->%*) {
my $abs_subdir = abs_path($class->get_subdir($scfg, $vtype));
die "storage '$storeid' uses directory $abs_subdir for multiple content types\n"
if defined($resolved_subdirs->{$abs_subdir});
$resolved_subdirs->{$abs_subdir} = 1;
}
}
return if defined($scfg->{'create-subdirs'}) && !$scfg->{'create-subdirs'}; return if defined($scfg->{'create-subdirs'}) && !$scfg->{'create-subdirs'};
# FIXME The mkdir option is deprecated. Remove with PVE 9? # FIXME The mkdir option is deprecated. Remove with PVE 9?