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

config: use relative paths for content overrides

Browse Source 
Remove the requirement for paths to start with a /, as it might be
confusing to users.

Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
This commit is contained in:
Leo Nunner
2023-03-14 14:14:54 +01:00
committed by Thomas Lamprecht
parent 574fb9ad11
commit a3c30c6871
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage/Plugin.pm
View File

@ -355,7 +355,7 @@ PVE::JSONSchema::register_format('pve-dir-override', \&verify_dir_override);
sub verify_dir_override { sub verify_dir_override {
my ($value, $noerr) = @_; my ($value, $noerr) = @_;
if ($value =~ m/^([-a-z]+)=\/.+$/ && verify_content($1, $noerr)) { if ($value =~ m/^([a-z]+)=[^.]+$/ && verify_content($1, $noerr)) {
return $value; return $value;
} }
@ -658,9 +658,9 @@ sub get_subdir {
die "storage definition has no path\n" if !$path; die "storage definition has no path\n" if !$path;
die "unknown vtype '$vtype'\n" if !exists($vtype_subdirs->{$vtype}); die "unknown vtype '$vtype'\n" if !exists($vtype_subdirs->{$vtype});
my $subdir = $scfg->{"content-dirs"}->{$vtype} // "/".$vtype_subdirs->{$vtype}; my $subdir = $scfg->{"content-dirs"}->{$vtype} // $vtype_subdirs->{$vtype};
return $path.$subdir; return "$path/$subdir";
} }
sub filesystem_path { sub filesystem_path {

4
test/get_subdir_test.pm
View File

@ -29,9 +29,9 @@ foreach my $type (keys %$vtype_subdirs) {
# creates additional tests for overrides # creates additional tests for overrides
foreach my $type (keys %$vtype_subdirs) { foreach my $type (keys %$vtype_subdirs) {
my $override = "/${type}_override"; my $override = "${type}_override";
my $scfg_with_override = { path => '/some/path', 'content-dirs' => { $type => $override } }; my $scfg_with_override = { path => '/some/path', 'content-dirs' => { $type => $override } };
push @$tests, [ $scfg_with_override, $type, "$scfg_with_override->{path}$scfg_with_override->{'content-dirs'}->{$type}" ]; push @$tests, [ $scfg_with_override, $type, "$scfg_with_override->{path}/$scfg_with_override->{'content-dirs'}->{$type}" ];
} }
plan tests => scalar @$tests; plan tests => scalar @$tests;