Skip to content

Initial implementation for /etc merge #1485

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

Draft
wants to merge 10 commits into
base: composefs-backend
Choose a base branch
from
Draft

Initial implementation for /etc merge #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca2c3e8
Initial implementaion for /etc merge
Johan-Liebert1 Aug 5, 2025
71a2fae
etc-merge: Incremental hash computation + test verity
Johan-Liebert1 Aug 6, 2025
a199bd0
Bump composefs-fs
Johan-Liebert1 Aug 7, 2025
e781f44
etc-merge: Use generic-tree from composefs-rs
Johan-Liebert1 Aug 7, 2025
ff83b65
Get removed files by traversing
Johan-Liebert1 Aug 10, 2025
6bb619e
etc-merge: Implement merge
Johan-Liebert1 Aug 11, 2025
c226cf4
etc-merge: Handle ownership changes
Johan-Liebert1 Aug 11, 2025
d527926
etc-merge: Handle xattrs
Johan-Liebert1 Aug 12, 2025
f1c87a7
etc-merge: Ignore mtime while comparing stat
Johan-Liebert1 Aug 12, 2025
3e6d0f7
Remove chown test
Johan-Liebert1 Aug 12, 2025
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
20 changes: 17 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ anyhow = "1.0.82"
camino = "1.1.6"
canon-json = "0.2.1"
cap-std-ext = "4.0.3"
composefs = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs", features = ["rhel9"] }
composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-boot" }
composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-oci" }
composefs = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs", features = ["rhel9"] }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to reduce conflicts let's do separate PRs for bumping crate dependencies.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in #1503

composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs-boot" }
composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs-oci" }
chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
clap_mangen = { version = "0.2.20" }
Expand Down
17 changes: 17 additions & 0 deletions crates/etc-merge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[package]
name = "etc-merge"
version = "0.1.0"
edition = "2024"

[dependencies]
anyhow = { workspace = true }
cap-std-ext = { workspace = true }
rustix = { workspace = true }
openssl = { workspace = true }
hex = { workspace = true }
tracing = { workspace = true }
composefs = { workspace = true }
fn-error-context = { workspace = true }

[lints]
workspace = true
Loading