Skip to content

daemon/upgrader: Print OSTree signature verification text when pulling OCI #5223

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.

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

Merged
merged 1 commit into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions rpmostree-cxxrs.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,7 @@ struct ContainerImageState final
::rust::String image_digest;
::rust::String version;
::rpmostreecxx::ExportedManifestDiff cached_update_diff;
::rust::String verify_text;

using IsRelocatable = ::std::true_type;
};
Expand Down
1 change: 1 addition & 0 deletions rpmostree-cxxrs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ struct ContainerImageState final
::rust::String image_digest;
::rust::String version;
::rpmostreecxx::ExportedManifestDiff cached_update_diff;
::rust::String verify_text;

using IsRelocatable = ::std::true_type;
};
Expand Down
1 change: 1 addition & 0 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ pub mod ffi {
pub image_digest: String,
pub version: String,
pub cached_update_diff: ExportedManifestDiff,
pub verify_text: String,
}

#[derive(Debug, Default)]
Expand Down
1 change: 1 addition & 0 deletions rust/src/sysroot_upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ impl From<Box<ostree_container::store::LayeredImageState>> for crate::ffi::Conta
image_digest: s.manifest_digest.to_string(),
version,
cached_update_diff,
verify_text: s.verify_text.unwrap_or_default(),
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/daemon/rpmostree-sysroot-upgrader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,8 @@ rpmostree_sysroot_upgrader_pull_base (RpmOstreeSysrootUpgrader *self, const char
rpmostreecxx::pull_container (*self->repo, *cancellable, r.refspec.c_str ()),
error);

if (!import->verify_text.empty ())
rpmostree_output_message ("%s", import->verify_text.c_str ());
new_base_rev = g_strdup (import->merge_commit.c_str ());
}
break;
Expand Down
Loading