From a356ed897bf13ba4665276f3f614a23d2e95023e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 8 Sep 2023 15:10:06 -0400
Subject: [PATCH 1/2] ci: Re-disable force init

Since we have a c9s build now.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69bd634..428bd5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ build-push:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   variables:
-    COMPOSE_INITIALIZE: "1"
+    COMPOSE_INITIALIZE: ""
     FORCE: ""
   stage: build
   before_script:

From f3cdf59cfdc630b01af10c647ff3e571f5b3b4eb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 8 Sep 2023 15:16:41 -0400
Subject: [PATCH 2/2] Enable /usr/bin/bootc by default

Let's opt in for these images.
---
 oscore/bootc.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/oscore/bootc.yaml b/oscore/bootc.yaml
index 9f970d2..2bee9fc 100644
--- a/oscore/bootc.yaml
+++ b/oscore/bootc.yaml
@@ -16,3 +16,9 @@ exclude-packages:
   # chosen as the package to satisfy the `kernel-core` dependency from
   # the kernel package.
   - kernel-debug-core
+
+# rpm-ostree can be an alias for bootc, we want to enable that here.
+postprocess:
+  - |
+    #!/usr/bin/env bash
+    ln -sr /usr/bin/{rpm-ostree,bootc}