From ab4d82834b73992ed903cc5e00779380c5d07e4c Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Apr 19 2024 21:37:12 +0000
Subject: Remove subscription-manager and related tweaks


Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/tier-0/bootc-config.yaml b/tier-0/bootc-config.yaml
index f885d91..9999ad6 100644
--- a/tier-0/bootc-config.yaml
+++ b/tier-0/bootc-config.yaml
@@ -1,10 +1,10 @@
 # Configuration for bootc
 postprocess:
-  # XFS is our default filesystem
+  # ext4 is our default filesystem
   - |
     #!/usr/bin/env bash
     mkdir -p /usr/lib/bootc/install/
-    cat > /usr/lib/bootc/install/20-rhel.toml << EOF
+    cat > /usr/lib/bootc/install/20-default-root.toml << EOF
     [install]
-    root-fs-type = "xfs"
+    root-fs-type = "ext4"
     EOF
diff --git a/tier-1/rpm-packaging.yaml b/tier-1/rpm-packaging.yaml
index 89e7a8a..306e876 100644
--- a/tier-1/rpm-packaging.yaml
+++ b/tier-1/rpm-packaging.yaml
@@ -2,15 +2,4 @@
 # `dnf update` *client side* doesn't do much helpful...
 packages:
   - dnf
-  # To ensure we can enable client certs to access RHEL content
-  - subscription-manager
 
-postprocess:
-  # 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