Skip to content

[stable26] Fix root mounts not being setup in some cases #41091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Dec 7, 2023
Merged

[stable26] Fix root mounts not being setup in some cases #41091

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db5da9
add more checks to ensure mounts aren't empty
icewind1991 Jun 28, 2023
14b759d
setup filesystem wrappers before we mark the root as setup
icewind1991 Jul 25, 2023
48b7eff
Merge branch 'stable26' into backport/39044/stable26
AndyScherzinger Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
setup filesystem wrappers before we mark the root as setup 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Oct 24, 2023
commit 14b759d0d35113b4b50f00d3c8d7156d63de3387
5 changes: 3 additions & 2 deletions lib/private/Files/SetupManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,13 @@ public function setupRoot(): void {
if ($this->rootSetup) {
return;
}

$this->setupBuiltinWrappers();

$this->rootSetup = true;

$this->eventLogger->start('fs:setup:root', 'Setup root filesystem');

$this->setupBuiltinWrappers();

$rootMounts = $this->mountProviderCollection->getRootMounts();
foreach ($rootMounts as $rootMountProvider) {
$this->mountManager->addMount($rootMountProvider);
Expand Down