aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Files
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2024-08-20 13:31:35 +0200
committerRobin Appelman <robin@icewind.nl>2024-08-20 13:31:35 +0200
commit107120105231f6d3402a204efb15854a0971fc64 (patch)
treec6ce1b38c298d7ceaa662f1184176e957bd977d8 /lib/private/Files
parent560282a47bf3f9dca4653f89d530a6e1dd144f5f (diff)
downloadnextcloud-server-107120105231f6d3402a204efb15854a0971fc64.tar.gz
nextcloud-server-107120105231f6d3402a204efb15854a0971fc64.zip
feat: store the mountpoint of storages in the mount options
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files')
-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 53befe57e36..3a3f7ba9c11 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -107,8 +107,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;
});