From cc14ffc160a87b61fa4718a1c232528bf66c3694 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <mnguyen@redhat.com>
Date: Mon, 20 Jan 2025 21:42:10 -0500
Subject: [PATCH] manifest-ocp-rhel-9.6: get toolbox from ART plashet

RHCOS is trying to move to a point where all container tool
packages come from RHEL instead of the ART plashet[0]. This is part
of the effort to have a RHEL only bootstrap image and a layered container
image for the node. Unfortunately there is already a package in RHEL
called toolbox which conflicts with the RHCOS toolbox.

Ensure that RHCOS gets the RHCOS toolbox by only getting the package
from the ART plashet.

[0] https://issues.redhat.com/browse/RHELPLAN-170883
---
 manifest-ocp-rhel-9.4.yaml | 1 +
 manifest-ocp-rhel-9.6.yaml | 4 +++-
 packages-rhcos.yaml        | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifest-ocp-rhel-9.4.yaml b/manifest-ocp-rhel-9.4.yaml
index e14602175..08bf7f145 100644
--- a/manifest-ocp-rhel-9.4.yaml
+++ b/manifest-ocp-rhel-9.4.yaml
@@ -98,3 +98,4 @@ repo-packages:
       - cri-tools
       - openshift-clients
       - openshift-kubelet
+      - toolbox
diff --git a/manifest-ocp-rhel-9.6.yaml b/manifest-ocp-rhel-9.6.yaml
index 006f8e9d3..35304d9a0 100644
--- a/manifest-ocp-rhel-9.6.yaml
+++ b/manifest-ocp-rhel-9.6.yaml
@@ -97,7 +97,9 @@ repo-packages:
       - podman
       - runc
       - skopeo
-      - toolbox
   - repo: rhel-9.6-appstream
     packages:
       - ignition
+  - repo: rhel-9.6-server-ose-4.19
+    packages:
+      - toolbox
diff --git a/packages-rhcos.yaml b/packages-rhcos.yaml
index e2f5d6129..392db8ff0 100644
--- a/packages-rhcos.yaml
+++ b/packages-rhcos.yaml
@@ -15,7 +15,6 @@ packages:
   - nss-altfiles
   - ostree
   - rpm-ostree
-  - toolbox
   # for kdump:
   # https://github.com/coreos/fedora-coreos-tracker/issues/622
   - kexec-tools