manifests: Merge EL9 manifests and overlays

Now that we only have RHCOS based on RHEL 9 and SCOS based on C9S, we can merge the manifests again.
prestist · Jun 5, 2023 · 0dd1104 · 0dd1104
1 parent f204425
commit 0dd1104
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 21 deletions.
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -9,7 +9,6 @@ include:
   - networking-tools.yaml
   - user-experience.yaml
   - shared-workarounds.yaml
-  - shared-el9.yaml
 
 ostree-layers:
   - overlay/05core

diff --git a/manifests/shared-el9.yaml b/manifests/shared-el9.yaml
diff --git a/manifests/system-configuration.yaml b/manifests/system-configuration.yaml
@@ -37,6 +37,8 @@ packages:
   # Boost starving threads
   # https://github.com/coreos/fedora-coreos-tracker/issues/753
   - stalld
+  # Ignition aware SSH key management
+  - ssh-key-dir
 
 postprocess:
   # Mask systemd-repart. Ignition is responsible for partition setup on first

diff --git a/...lib/dracut/dracut.conf.d/coreos-zstd.conf → ...lib/dracut/dracut.conf.d/coreos-zstd.conf b/...lib/dracut/dracut.conf.d/coreos-zstd.conf → ...lib/dracut/dracut.conf.d/coreos-zstd.conf
@@ -1,8 +1,4 @@
 # Compress initrd with zstd.  dracut defaults to -15, but we want the
 # maximum reasonable compression, so override the command line to use
 # dracut's defaults along with -19.
-#
-# We can't use this in RHCOS 8 because the kernel doesn't enable
-# CONFIG_RD_ZSTD.
-
 compress="zstd -19 -q -T0"
diff --git a/overlay.d/06el9/statoverride b/overlay.d/06el9/statoverride
diff --git a/overlay.d/README.md b/overlay.d/README.md
@@ -8,11 +8,7 @@ longer the case).
 
 This overlay matches `fedora-coreos-base.yaml`; core Ignition+ostree bits.
 
-06el9
------
-
-This overlay includes content shared between FCOS and RHCOS/SCOS 9, but not
-RHCOS 8.
+This overlay is shared with RHCOS/SCOS 9.
 
 08nouveau
 ---------