aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2024-08-20 13:31:35 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-08-20 14:22:44 +0000
commite9fcf6bc9c141f974495730bbd4b1e9e5a2db021 (patch)
treec902993f5226c80f7d8ca7cffe548f87e834ec77 /lib/private
parent1e93ebc9a6179f6e9a0e01247f05105c205ab06d (diff)
downloadnextcloud-server-e9fcf6bc9c141f974495730bbd4b1e9e5a2db021.tar.gz
nextcloud-server-e9fcf6bc9c141f974495730bbd4b1e9e5a2db021.zip
feat: store the mountpoint of storages in the mount options
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Files/SetupManager.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index 93b7dc37b6b..d559f88c2f9 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -122,8 +122,9 @@ class SetupManager {
$prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false);
Filesystem::addStorageWrapper('mount_options', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
- if ($mount->getOptions() && $storage->instanceOfStorage(Common::class)) {
- $storage->setMountOptions($mount->getOptions());
+ if ($storage->instanceOfStorage(Common::class)) {
+ $options = array_merge($mount->getOptions(), ['mount_point' => $mountPoint]);
+ $storage->setMountOptions($options);
}
return $storage;
});