Move NetworkManager-team/teamd to EL9 shared manifest

See: coreos/fedora-coreos-tracker#1727
travier · May 14, 2024 · a75f75d · a75f75d
1 parent 832c42b
commit a75f75d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -12,6 +12,7 @@ include:
   - shared-workarounds.yaml
   # See https://github.com/coreos/bootupd
   - bootupd.yaml
+  - shared-el9.yaml
 ostree-layers:
   - overlay/05core
   - overlay/08nouveau

diff --git a/manifests/networking-tools.yaml b/manifests/networking-tools.yaml
@@ -7,9 +7,6 @@ packages:
   - NetworkManager hostname
   # Interactive Networking configuration during coreos-install
   - NetworkManager-tui
-  # Teaming https://github.com/coreos/fedora-coreos-config/pull/289
-  # and http://bugzilla.redhat.com/1758162
-  - NetworkManager-team teamd
   # Support for cloud quirks and dynamic config in real rootfs:
   # https://github.com/coreos/fedora-coreos-tracker/issues/320
   - NetworkManager-cloud-setup

diff --git a/manifests/shared-el9.yaml b/manifests/shared-el9.yaml
@@ -0,0 +1,5 @@
+# Shared with EL 9 (CentOS Stream 9 and RHCOS 9) only
+packages:
+  # Teaming https://github.com/coreos/fedora-coreos-config/pull/289
+  # and http://bugzilla.redhat.com/1758162
+  - NetworkManager-team teamd