From e346f8a350269e3966db9ade9df694e971cd3dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Thu, 16 Mar 2023 11:32:12 +0100
Subject: [PATCH 1/2] Revert "manifest/9.2: Ensure package come from RHEL by
 default"

We already have to use coreos-installer from the RHAOS repo and it's
likely that we will have to do it again in the future for 4.14.

Remove this to avoid having to make a PR for each package.

This reverts commit 49f9824db2b6f929567d2d41cea6c97df766cf37.
---
 manifest-rhel-9.2.yaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml
index 3239ad2b5..f0633cd4c 100644
--- a/manifest-rhel-9.2.yaml
+++ b/manifest-rhel-9.2.yaml
@@ -147,15 +147,6 @@ repo-packages:
       - nss-altfiles
       # Use the new containers/toolbox
       - toolbox
-      # RHCOS packages that are now part of RHEL and that will have to be
-      # explicitely removed from this list if they have to come from the RHAOS
-      # repo again.
-      - afterburn
-      - console-login-helper-messages-issuegen console-login-helper-messages-profile
-      - coreos-installer coreos-installer-bootinfra
-      - ignition
-      - ostree
-      - rpm-ostree
   - repo: rhel-9.0-server-ose-4.13
     packages:
       - conmon-rs

From 3eb4abbaf2f892eb35a9c309b2ecd09b60c3d0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Thu, 16 Mar 2023 11:50:23 +0100
Subject: [PATCH 2/2] manifest/9.2: Keep legacy coreos/toolbox

Unfortuantely, we're not yet ready to move to the new containers/toolbox
workflow. We'll attempt that for a future release.

See: https://issues.redhat.com/browse/OCPBUGS-8009
Partially reverts: https://github.com/openshift/os/commit/65776fa6e94fc25d73fd32a26f38547d55f61d44
---
 manifest-rhel-9.2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest-rhel-9.2.yaml b/manifest-rhel-9.2.yaml
index f0633cd4c..6686bd972 100644
--- a/manifest-rhel-9.2.yaml
+++ b/manifest-rhel-9.2.yaml
@@ -145,8 +145,6 @@ repo-packages:
     packages:
       # We want the one shipping in RHEL, not the equivalently versioned one in RHAOS
       - nss-altfiles
-      # Use the new containers/toolbox
-      - toolbox
   - repo: rhel-9.0-server-ose-4.13
     packages:
       - conmon-rs
@@ -154,3 +152,5 @@ repo-packages:
       - cri-tools
       - openshift-clients
       - openshift-hyperkube
+      # Use legacy coreos/toolbox until we're ready to use containers/toolbox
+      - toolbox