From cfafc9e78a0c9cbdb016113edd6a5dd35d87ab8b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 18 Apr 2024 17:08:07 -0400
Subject: [PATCH] Only set default filesystem to XFS in CentOS

Fedora default filesystem is a messier situation.  This makes
it easier to inherit Fedora builds.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 centos-stream-10.yaml     |  5 ++---
 centos-stream-9.yaml      |  5 ++---
 centos-stream-common.yaml | 14 ++++++++++++++
 tier-0/bootc-config.yaml  | 10 ----------
 tier-0/manifest.yaml      |  1 -
 5 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 centos-stream-common.yaml

diff --git a/centos-stream-10.yaml b/centos-stream-10.yaml
index 124acb8..899ed3e 100644
--- a/centos-stream-10.yaml
+++ b/centos-stream-10.yaml
@@ -2,6 +2,5 @@ releasever: stream10
 variables:
   distro: "stream10"
 
-repos:
-  - baseos
-  - appstream
+include:
+  - centos-stream-common.yaml
diff --git a/centos-stream-9.yaml b/centos-stream-9.yaml
index 751dbe5..744f873 100644
--- a/centos-stream-9.yaml
+++ b/centos-stream-9.yaml
@@ -2,6 +2,5 @@ releasever: stream9
 variables:
   distro: "stream9"
 
-repos:
-  - baseos
-  - appstream
+include:
+  - centos-stream-common.yaml
diff --git a/centos-stream-common.yaml b/centos-stream-common.yaml
new file mode 100644
index 0000000..16c0981
--- /dev/null
+++ b/centos-stream-common.yaml
@@ -0,0 +1,14 @@
+repos:
+  - baseos
+  - appstream
+
+# Configuration for bootc
+postprocess:
+  # XFS is our default filesystem
+  - |
+    #!/usr/bin/env bash
+    mkdir -p /usr/lib/bootc/install/
+    cat > /usr/lib/bootc/install/20-rhel.toml << EOF
+    [install]
+    root-fs-type = "xfs"
+    EOF
diff --git a/tier-0/bootc-config.yaml b/tier-0/bootc-config.yaml
index f885d91..e69de29 100644
--- a/tier-0/bootc-config.yaml
+++ b/tier-0/bootc-config.yaml
@@ -1,10 +0,0 @@
-# Configuration for bootc
-postprocess:
-  # XFS is our default filesystem
-  - |
-    #!/usr/bin/env bash
-    mkdir -p /usr/lib/bootc/install/
-    cat > /usr/lib/bootc/install/20-rhel.toml << EOF
-    [install]
-    root-fs-type = "xfs"
-    EOF
diff --git a/tier-0/manifest.yaml b/tier-0/manifest.yaml
index 007f6d7..8da4235 100644
--- a/tier-0/manifest.yaml
+++ b/tier-0/manifest.yaml
@@ -51,7 +51,6 @@ remove-from-packages:
 include:
   - bootc.yaml
   - ostree.yaml
-  - bootc-config.yaml
   - initramfs.yaml
   - autoupdates.yaml
   - basic-fixes.yaml