From dd0a042a1780c847d6baecae1abaade514de5889 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 8 Dec 2023 12:45:00 -0500 Subject: [PATCH] Always add bootc install config bootc isn't in C9S yet, but it is in the -dev images. Add the install config unconditionally so that `bootc install` works in the `centos-bootc-dev` image. --- tier-0/bootc-config.yaml | 10 ++++++++++ tier-0/bootc.yaml | 10 ---------- tier-0/manifest.yaml | 1 + tier-1/bootc-config.yaml | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 tier-0/bootc-config.yaml create mode 120000 tier-1/bootc-config.yaml diff --git a/tier-0/bootc-config.yaml b/tier-0/bootc-config.yaml new file mode 100644 index 0000000..f885d91 --- /dev/null +++ b/tier-0/bootc-config.yaml @@ -0,0 +1,10 @@ +# 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.yaml b/tier-0/bootc.yaml index 10c09f4..a862e6c 100644 --- a/tier-0/bootc.yaml +++ b/tier-0/bootc.yaml @@ -10,13 +10,3 @@ exclude-packages: # chosen as the package to satisfy the `kernel-core` dependency from # the kernel package. - kernel-debug-core - -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 6e79d13..8ec2832 100644 --- a/tier-0/manifest.yaml +++ b/tier-0/manifest.yaml @@ -55,6 +55,7 @@ conditional-include: include: - ostree.yaml + - bootc-config.yaml - initramfs.yaml packages: diff --git a/tier-1/bootc-config.yaml b/tier-1/bootc-config.yaml new file mode 120000 index 0000000..9f9c8ab --- /dev/null +++ b/tier-1/bootc-config.yaml @@ -0,0 +1 @@ +../tier-0/bootc-config.yaml \ No newline at end of file