Enable puzzlefs to be used as a MOUNT_HELPER in the LXC OCI template #133
Conversation
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
tych0
approved these changes
Oct 3, 2024
The mount-helper is called like this: mount-helper mount --writable <oci_dir>:<oci_name> <mountpoint> mount-helper umount <mountpoint> I've added the support for the `--writable` flag that creates a writable overlay on top of a PuzzleFS mountpoint (used as a lowerdir). This requires root privileges. I've also added the support for the `umount` subcommand which detects whether the puzzlefs filesystem was mounted as a read-only fuse driver or whether an overlay was created on top of it, and handles the unmounting accordingly. Unmounting an overlay requires root privileges. I've implemented the changes on the LXC side in [1]. [1] lxc/lxc#4483 Signed-off-by: Ariel Miculas-Trif <[email protected]>
ariel-miculas
force-pushed
the
add-overlay-support
branch
from
e3cc4af to
a2a2645
Compare
…y's upperdir Signed-off-by: Ariel Miculas-Trif <[email protected]>
Fix the following errors reported by clippy:
```
error: manual arithmetic check found
--> puzzlefs-lib/src/reader/puzzlefs.rs:45:27
|
45 | let addl_offset = if offset > file_offset {
| ___________________________^
46 | | offset - file_offset
47 | | } else {
48 | | 0
49 | | };
| |_________^ help: replace it with: `offset.saturating_sub(file_offset)`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#implicit_saturating_sub
= note: `-D clippy::implicit-saturating-sub` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::implicit_saturating_sub)]`
```
and ignore the needless-lifetimes errors reported on the autogenerated
capnp code:
```
|
15 | impl <'a,> ::core::marker::Copy for Reader<'a,> {}
| ^^ ^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_lifetimes
= note: `-D clippy::needless-lifetimes` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::needless_lifetimes)]`
help: elide the lifetimes
|
15 - impl <'a,> ::core::marker::Copy for Reader<'a,> {}
15 + impl ::core::marker::Copy for Reader<'_,> {}
|
```
Signed-off-by: Ariel Miculas-Trif <[email protected]>
ariel-miculas
force-pushed
the
add-overlay-support
branch
from
a2a2645 to
1db9958
Compare
hallyn
approved these changes
Oct 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The mount-helper is called like this:
mount-helper mount --writable <oci_dir>:<oci_name> mount-helper umount
I've added the support for the
--writableflag that creates a writable overlay on top of a PuzzleFS mountpoint (used as a lowerdir). This requires root privileges.I've also added the support for the
umountsubcommand which detects whether the puzzlefs filesystem was mounted as a read-only fuse driver or whether an overlay was created on top of it, and handles the unmounting accordingly. Unmounting an overlay requires root privileges.I've implemented the changes on the LXC side in [1].
[1] lxc/lxc#4483