main: Update ostree-ext, add provisional-repair entrypoint

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)
coreos · Jul 21, 2023 · 53fb8c7 · 53fb8c7
1 parent ced6de0
commit 53fb8c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
@@ -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
 

diff --git a/rust/src/main.rs b/rust/src/main.rs
@@ -53,7 +53,9 @@ 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"
     }
 }