-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Sasha Finkelstein <[email protected]>
- Loading branch information
1 parent
2b48297
commit c7b0175
Showing
2 changed files
with
162 additions
and
0 deletions.
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
app-emulation/muvm/files/muvm-0.1.2-do-not-clobber-fex-config.patch
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/crates/muvm/src/guest/mount.rs b/crates/muvm/src/guest/mount.rs | ||
index adeb327..b4ffb58 100644 | ||
--- a/crates/muvm/src/guest/mount.rs | ||
+++ b/crates/muvm/src/guest/mount.rs | ||
@@ -74,6 +74,10 @@ fn mount_fex_rootfs() -> Result<()> { | ||
} else if images.len() == 1 { | ||
// Just expose the one mount | ||
symlink(&images[0], &dir_rootfs)?; | ||
+ } else if images.is_empty() { | ||
+ // If no images were passed, FEX is either managed by the host os | ||
+ // or is not installed at all. Avoid clobbering the config in that case. | ||
+ return Ok(()) | ||
} | ||
|
||
// Now we need to tell FEX about this. One of the FEX share directories has an unmounted rootfs |
This file contains 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