From 0d8c7ea4fd97c9fcc0928b091470900badf140b3 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 20 Oct 2023 09:52:40 -0400 Subject: [PATCH] deploy: Always use merge commit I don't recall now the rationale for the previous code; if we're using this path we always want to be in a container-native mode. Currently the "unpack to pure ostree commit" gets triggered if one uses this on a container image created via raw `ostree container encapsulate`. Anyone who wants the prior behavior should instead unencapsulate and deploy the underlying commit. --- lib/src/container/deploy.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/container/deploy.rs b/lib/src/container/deploy.rs index 410da1d6..fcd750ae 100644 --- a/lib/src/container/deploy.rs +++ b/lib/src/container/deploy.rs @@ -81,7 +81,7 @@ pub async fn deploy( imp.import(prep).await? } }; - let commit = state.get_commit(); + let commit = state.merge_commit.as_str(); let origin = glib::KeyFile::new(); let target_imgref = options.target_imgref.unwrap_or(imgref); origin.set_string("origin", ORIGIN_CONTAINER, &target_imgref.to_string());