From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 9 Jun 2023 11:57:14 +0000 (+0200)
Subject: content dirs: skip creation if either mkdir or create-subdirs is false
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=030e5ad55028798a320461ff6fc7ec5d1321ef63;p=pve-storage.git

content dirs: skip creation if either mkdir or create-subdirs is false

This is slightly confusing due to both options, the legacy convoluted
one and the new targeted one, exist, but before the rework we skip if
either of those sub-expressions was true, so doing it needs both to
be true.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 4ab1282..ab6b675 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -1377,7 +1377,7 @@ sub activate_storage {
 	if (
 	    (!defined($scfg->{'create-subdirs'}) || $scfg->{'create-subdirs'})
 	    # FIXME The mkdir option is deprecated. Remove with PVE 9?
-	    || (!defined($scfg->{mkdir}) || $scfg->{mkdir})
+	    && (!defined($scfg->{mkdir}) || $scfg->{mkdir})
 	) {
 	    for my $vtype (sort keys %$vtype_subdirs) {
 		# OpenVZMigrate uses backup (dump) dir