Skip to content

Commit

Permalink
main: Update ostree-ext, add provisional-repair entrypoint
Browse files Browse the repository at this point in the history
This updates us to vendor the provisional-repair code.  One can
now run `ostree provisional-repair` directly.

(Yes, it's very confusing how in rpm-ostree, we vendor the ostree-ext
 source, and then install a wrapper symlink which tells the main
 (C) `ostree` binary to call back into us... but it's how the
 `ostree container` stuff has been working for a long time)
  • Loading branch information
cgwalters committed Jul 21, 2023
1 parent ced6de0 commit 5592d4b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Makefile-rpm-ostree.am
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ install-rpmostree-hook:
install -m 0755 -t $(DESTDIR)$(bindir) rpm-ostree
install -d -m 0755 $(ostreeextdir)
ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-ima-sign
ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-provisional-repair
ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-container
INSTALL_EXEC_HOOKS += install-rpmostree-hook

Expand Down
2 changes: 1 addition & 1 deletion rust/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async fn dispatch_ostree_ext(args: Vec<String>) -> Result<i32> {
/// Dispatch multicall binary to relevant logic, based on callname from `argv[0]`.
async fn dispatch_multicall(callname: String, args: Vec<String>) -> Result<i32> {
match callname.as_str() {
"ostree-container" | "ostree-ima-sign" => dispatch_ostree_ext(args).await,
"ostree-container" | "ostree-ima-sign" | "ostree-provisional-repair" => dispatch_ostree_ext(args).await,
_ => inner_async_main(args).await, // implicitly includes "rpm-ostree"
}
}
Expand Down

0 comments on commit 5592d4b

Please sign in to comment.