From e6edbd547e8d023188e0f550e7b5704e32df563e Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 26 Apr 2024 15:47:26 -0400 Subject: [PATCH 1/2] Add subscription-manager This package used to be part of the manifests we inherited from the fedora-bootc definitions, but it was removed there. Let's add it back here by default since CentOS Stream is much closer to RHEL. --- centos-stream-common.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/centos-stream-common.yaml b/centos-stream-common.yaml index 16c0981..bba53bb 100644 --- a/centos-stream-common.yaml +++ b/centos-stream-common.yaml @@ -2,6 +2,9 @@ repos: - baseos - appstream +packages: + - subscription-manager + # Configuration for bootc postprocess: # XFS is our default filesystem @@ -12,3 +15,11 @@ postprocess: [install] root-fs-type = "xfs" EOF + # These enable librhsm which enables host subscriptions to work in containers + # https://github.com/rpm-software-management/librhsm/blob/fcd972cbe7c8a3907ba9f091cd082b1090231492/rhsm/rhsm-context.c#L30 + # https://github.com/openshift/os/pull/876/commits/dd35dd0e102aeed90df14f05c8ae9da4c8c5962a + - | + #!/usr/bin/bash + set -xeuo pipefail + ln -sr /run/secrets/etc-pki-entitlement /etc/pki/entitlement-host + ln -sr /run/secrets/rhsm /etc/rhsm-host From 2b22ff49722d9593b8ca9b2fdd88f808f1cd52b9 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 26 Apr 2024 16:18:21 -0400 Subject: [PATCH 2/2] Bump fedora-bootc submodule to 582297efcc7840529f909e2220ad554fba798c93 ``` Colin Walters (3): tekton: s/centos/fedora/ README: Update docs link Remove centos bits Jonathan Lebon (3): Remove `.github/` README.md: add a "Building" section tier-1: drop subscription-manager ``` --- fedora-bootc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-bootc b/fedora-bootc index 27ead1f..582297e 160000 --- a/fedora-bootc +++ b/fedora-bootc @@ -1 +1 @@ -Subproject commit 27ead1f82a993e2734cb8100f80eb67b7c9375bd +Subproject commit 582297efcc7840529f909e2220ad554fba798c93