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:24:43 +0000
commitece54cf9561c44009858899ff441240f890af41c (patch)
treecbb9434fc0ee5974417fea68927f3f3b9e044890 /lib/private
parentb8adb8bfd6e7dd15a42fc05c5f61bf4c2c17eb2d (diff)
downloadnextcloud-server-ece54cf9561c44009858899ff441240f890af41c.tar.gz
nextcloud-server-ece54cf9561c44009858899ff441240f890af41c.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 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;
});