From 599cb3a5c0637cb1a5d6a4a0cce6cab8b6482967 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Tue, 11 Oct 2022 16:44:35 -0400
Subject: [PATCH] Revert "install oci-utils from oracle repository"

This reverts commit c2843203d09fd8c5d2fb97d55635f7674db1b6b1.
---
 Rocky-9-OCP.ks | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/Rocky-9-OCP.ks b/Rocky-9-OCP.ks
index b7be035..2a94086 100644
--- a/Rocky-9-OCP.ks
+++ b/Rocky-9-OCP.ks
@@ -1,7 +1,6 @@
 text
 repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9/BaseOS/$basearch/os/
 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9/AppStream/$basearch/os/
-repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL9/addons/$basearch/ --install --includepkgs="oci-utils"
 
 url --url http://dl.rockylinux.org/pub/rocky/9/BaseOS/$basearch/os/
 
@@ -137,10 +136,6 @@ sed -i -e 's/ rhgb quiet//' /boot/grub/grub.conf
 # enable resizing on copied AMIs
 echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
 
-
-# OCI - Start ocid on boot
-systemctl enable ocid.service
-
 # OCI - Need iscsi as a dracut module
 echo 'add_dracutmodules+="iscsi"' > /etc/dracut.conf.d/iscsi.conf
 
@@ -244,37 +239,25 @@ true
 %packages
 @core
 chrony
+dnf
+yum
 cloud-init
 cloud-utils-growpart
-cockpit-system
-cockpit-ws
-dhcp-client
-dnf
-dnf-utils
+NetworkManager
 dracut-config-generic
 firewalld
 gdisk
 grub2
-iscsi-initiator-utils
 kernel
-NetworkManager
 nfs-utils
-oci-utils
-python3-jsonschema
-qemu-guest-agent
-rng-tools
-rocky-release
 rsync
 tar
-yum
+dnf-utils
 yum-utils
-
 -aic94xx-firmware
 -alsa-firmware
 -alsa-lib
 -alsa-tools-firmware
--biosdevname
--iprutils
 -ivtv-firmware
 -iwl100-firmware
 -iwl1000-firmware
@@ -292,11 +275,25 @@ yum-utils
 -iwl6000g2b-firmware
 -iwl6050-firmware
 -iwl7260-firmware
--langpacks-*
--langpacks-en
 -libertas-sd8686-firmware
 -libertas-sd8787-firmware
 -libertas-usb8388-firmware
+-biosdevname
+-iprutils
 -plymouth
+
+python3-jsonschema
+qemu-guest-agent
+dhcp-client
+cockpit-ws
+cockpit-system
+-langpacks-*
+-langpacks-en
+
+
+iscsi-initiator-utils
+
+rocky-release
+rng-tools
 %end