mount: Add support for FEX merged rootfs mode#130
Merged
slp merged 2 commits intoAsahiLinux:mainfrom Jan 9, 2025
Merged
Conversation
hoshinolina
requested review from
WhatAmISupposedToPutHere,
alyssarosenzweig,
slp and
teohhanhui
as code owners
hoshinolina
force-pushed
the
fex-merged-rootfs
branch
from
7e649a1 to
8d7b1de
Compare
Contributor
Author
|
Disabled the Clippy warning since, in this case, its suggestion actually makes the code flow less logical. |
teohhanhui
reviewed
Dec 19, 2024
teohhanhui
reviewed
Dec 19, 2024
hoshinolina
force-pushed
the
fex-merged-rootfs
branch
from
3b38a37 to
d6158e5
Compare
Contributor
Author
|
Also note that this depends on containers/libkrun#244 (without it the overlayfs won't behave properly). |
hoshinolina
force-pushed
the
fex-merged-rootfs
branch
from
1e05ac1 to
5c777a9
Compare
Contributor
Author
|
Added one unrelated cleanup commit because it depends on changes in the base commit here. Hopefully shouldn't be controversial. |
teohhanhui
reviewed
Dec 21, 2024
teohhanhui
reviewed
Dec 21, 2024
hoshinolina
force-pushed
the
fex-merged-rootfs
branch
2 times, most recently
from
c39fb53 to
e346250
Compare
Contributor
Author
|
Reworked the logic a bit so merged_rootfs is ignored when the rootfs is host-managed (this means we can flip on the default without affecting those setups, which will make their own decision about merged rootfs behavior). Also unset the env var in that case, which should be cleaned up after #134 is merged since this should be moved to the config file. |
In this mode, the FEX rootfs passed to FEX is already overlaid on top of the real root filesystem, so FEX directs all guest accesses to it instead of doing its own overlay logic. This, together with a bunch of fixes on the FEX side, fixes Wine. Opt-in for now, since this actively *breaks* things with the current FEX. May become the default in the future once all that is sorted out. Signed-off-by: Asahi Lina <lina@asahilina.net>
Signed-off-by: Asahi Lina <lina@asahilina.net>
hoshinolina
force-pushed
the
fex-merged-rootfs
branch
from
e346250 to
e3bae0c
Compare
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In this mode, the FEX rootfs passed to FEX is already overlaid on top of the real root filesystem, so FEX directs all guest accesses to it instead of doing its own overlay logic. This, together with a bunch of fixes on the FEX side, fixes Wine.
Opt-in for now, since this actively breaks things with the current FEX. May become the default in the future once all that is sorted out.
The FEX config option name is speculative since it doesn't exist yet and it isn't strictly required to tell FEX about this, but I'd rather have it in to be able to change the logic on the FEX side in this mode as needed.