diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-08-20 13:31:35 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-08-20 14:18:16 +0000 |
| commit | 52da5f715f0be61ba82eccdbc9434abc7fce3e66 (patch) | |
| tree | c013c5df83789082d9fcf438bb22ce0e599cd62b /lib/private | |
| parent | 3edc0f58c14dc1f7d25681c1d643647f5f15ae61 (diff) | |
| download | nextcloud-server-52da5f715f0be61ba82eccdbc9434abc7fce3e66.tar.gz nextcloud-server-52da5f715f0be61ba82eccdbc9434abc7fce3e66.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.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index 511e80bd7d9..9e5ecbbc870 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -120,8 +120,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; }); |