Skip to content

Commit 7b970f0

Browse files
committed
ostree-ext: copy /usr metadata to root on merge commit
When building the merge commit in `write_merge_commit_impl()`, `write_dfd_to_mtree()` inherits the root dir metadata from the temp checkout dir, which causes its mode to be 0o755 rather than 0o555. Since systemd v261, this triggers a systemd-tmpfiles error on systems with read-only root: "fchmod() of / failed: Read-only file system". OCI images don't reliably include root directory metadata, so to match the approach used by composefs-rs [1], let's copy the metadata from /usr to the root. See: - coreos/fedora-coreos-tracker#2238 - coreos/fedora-coreos-tracker#2238 (comment) [1]: https://docs.rs/composefs/0.9.4/composefs/generic_tree/struct.FileSystem.html#method.copy_root_metadata_from_usr Assisted-by: llm Signed-off-by: Rolv Apneseth <rolv.apneseth@gmail.com>
1 parent 1a04bf2 commit 7b970f0

2 files changed

Lines changed: 40 additions & 0 deletions

File tree

‎crates/ostree-ext/src/container/store.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,24 @@ fn cleanup_root(root: &Dir) -> Result<()> {
624624
Ok(())
625625
}
626626

627+
/// Copy `/usr` directory metadata to the root, matching the composefs-rs
628+
/// approach since OCI images don't reliably include root dir metadata.
629+
///
630+
/// See:
631+
/// - <https://github.com/coreos/fedora-coreos-tracker/issues/2238>
632+
/// - <https://github.com/coreos/fedora-coreos-tracker/issues/2238#issuecomment-6082074286>
633+
fn normalize_root_dirmeta(mt: &ostree::MutableTree) -> Result<()> {
634+
let usr = mt.walk(&["usr"], 0).context("looking up /usr in mtree")?;
635+
636+
let usr_meta_checksum = usr.metadata_checksum();
637+
if usr_meta_checksum.is_empty() {
638+
anyhow::bail!("/usr has no metadata checksum in mtree");
639+
}
640+
641+
mt.set_metadata_checksum(&usr_meta_checksum);
642+
Ok(())
643+
}
644+
627645
impl ImageImporter {
628646
/// The metadata key used in ostree commit metadata to serialize
629647
const CACHED_KEY_MANIFEST_DIGEST: &'static str = "ostree-ext.cached.manifest-digest";
@@ -1307,6 +1325,8 @@ impl ImageImporter {
13071325
)
13081326
.context("Writing merged filesystem to mtree")?;
13091327

1328+
normalize_root_dirmeta(&mt).context("normalizing root dir metadata on mtree")?;
1329+
13101330
let merged_root = repo
13111331
.write_mtree(&mt, cancellable)
13121332
.context("Writing mtree")?;

‎crates/ostree-ext/tests/it/main.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,24 @@ fn assert_err_contains<T>(r: Result<T>, s: impl AsRef<str>) {
5858
}
5959
}
6060

61+
/// Verify that a commit's root directory metadata matches `/usr`.
62+
fn assert_root_dirmeta_matches_usr(repo: &ostree::Repo, commit: &str) {
63+
let root = repo.read_commit(commit, gio::Cancellable::NONE).unwrap().0;
64+
let root = root.downcast::<ostree::RepoFile>().unwrap();
65+
root.ensure_resolved().unwrap();
66+
67+
let usr = root.resolve_relative_path("usr");
68+
let usr = usr.downcast::<ostree::RepoFile>().unwrap();
69+
usr.ensure_resolved().unwrap();
70+
71+
let root_meta_checksum = root.tree_get_metadata_checksum().unwrap();
72+
let usr_meta_checksum = usr.tree_get_metadata_checksum().unwrap();
73+
assert_eq!(
74+
root_meta_checksum, usr_meta_checksum,
75+
"root dir metadata checksum should match /usr"
76+
);
77+
}
78+
6179
static TEST_REGISTRY: LazyLock<String> =
6280
LazyLock::new(|| match std::env::var_os("TEST_REGISTRY") {
6381
Some(t) => t.to_str().unwrap().to_owned(),
@@ -707,6 +725,7 @@ async fn test_export_as_container_nonderived() -> Result<()> {
707725
let reimported = fixture.must_import(&dest).await?;
708726
let reimport_ls = fixture::ostree_ls(fixture.destrepo(), &reimported.merge_commit).unwrap();
709727
similar_asserts::assert_eq!(initimport_ls, reimport_ls);
728+
assert_root_dirmeta_matches_usr(fixture.destrepo(), &reimported.merge_commit);
710729
Ok(())
711730
}
712731

@@ -1558,6 +1577,7 @@ async fn test_non_ostree() -> Result<()> {
15581577
similar_asserts::assert_eq!(&src_manifest, &dest_manifest);
15591578
}
15601579
assert_eq!(imp.manifest_digest, src_digest);
1580+
assert_root_dirmeta_matches_usr(fixture.destrepo(), &imp.merge_commit);
15611581
Ok(())
15621582
}
15631583

0 commit comments

Comments
 (0)