From 52da5f715f0be61ba82eccdbc9434abc7fce3e66 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 20 Aug 2024 13:31:35 +0200 Subject: feat: store the mountpoint of storages in the mount options Signed-off-by: Robin Appelman --- lib/private/Files/SetupManager.php | 5 +++-- 1 file 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; }); -- cgit v1.2.3