From a00a5aad1878d010d42d5803f4eed669315d0cf4 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 28 Mar 2024 23:38:44 -0700
Subject: [PATCH] config adjustments

* make sure config.xml is a symlink
* make sure repositories have assigned priorities

Signed-off-by: Louis Abel <label@rockylinux.org>
---
 config.xml                        | 32 +------------------------------
 configs/rocky.xml                 |  6 ++++++
 repositories/core.xml             |  8 ++++----
 repositories/epel.xml             |  2 +-
 repositories/oracle.xml           |  2 +-
 repositories/sig-cloud-common.xml |  2 +-
 6 files changed, 14 insertions(+), 38 deletions(-)
 mode change 100644 => 120000 config.xml

diff --git a/config.xml b/config.xml
deleted file mode 100644
index a5535ab..0000000
--- a/config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="7.4" name="Rocky">
-  <description type="system">
-    <author>Release Engineering (SIG/Core)</author>
-    <contact>releng@rockylinux.org</contact>
-    <specification>Rocky Linux</specification>
-  </description>
-  <preferences>
-    <version>9</version>
-    <packagemanager>dnf</packagemanager>
-    <locale>en_US</locale>
-    <keytable>us</keytable>
-    <timezone>UTC</timezone>
-    <release-version>9</release-version>
-  </preferences>
-  <include from="this://./repositories/core.xml"/>
-  <include from="this://./repositories/epel.xml"/>
-  <include from="this://./repositories/oracle.xml"/>
-  <include from="this://./components/boot.xml"/>
-  <include from="this://./components/users.xml"/>
-  <include from="this://./components/live/common.xml"/>
-  <include from="this://./components/live/xfce.xml"/>
-  <include from="this://./cloud/cloud.xml"/>
-  <include from="this://./container/container.xml"/>
-  <include from="this://./live/xfce.xml"/>
-  <packages type="bootstrap">
-    <package name="basesystem"/>
-    <package name="filesystem"/>
-  </packages>
-</image>
diff --git a/config.xml b/config.xml
new file mode 120000
index 0000000..8bd2f1d
--- /dev/null
+++ b/config.xml
@@ -0,0 +1 @@
+configs/rocky.xml
\ No newline at end of file
diff --git a/configs/rocky.xml b/configs/rocky.xml
index 21f8e7c..5a07361 100644
--- a/configs/rocky.xml
+++ b/configs/rocky.xml
@@ -15,13 +15,19 @@
     <release-version>9</release-version>
   </preferences>
   <include from="this://./repositories/core.xml"/>
+  <!-- research if these should be on for everything in general
+    would leaving these on affect what's pulled? original kickstarts used
+    would stick with our repos until the OCP images.
   <include from="this://./repositories/epel.xml"/>
   <include from="this://./repositories/oracle.xml"/>
+  <include from="this://./repositories/sig-cloud-common.xml"/>
+  -->
   <include from="this://./components/boot.xml"/>
   <include from="this://./components/users.xml"/>
   <include from="this://./components/live/common.xml"/>
   <include from="this://./components/live/xfce.xml"/>
   <include from="this://./cloud/cloud.xml"/>
+  <include from="this://./container/container.xml"/>
   <include from="this://./live/xfce.xml"/>
   <packages type="bootstrap">
     <package name="basesystem"/>
diff --git a/repositories/core.xml b/repositories/core.xml
index ef62e30..ad3dfe8 100644
--- a/repositories/core.xml
+++ b/repositories/core.xml
@@ -1,20 +1,20 @@
 <image>
-  <repository type="rpm-md" alias="baseos">
+  <repository type="rpm-md" alias="baseos" priority="1">
     <source path="https://download.rockylinux.org/stg/rocky/$releasever/BaseOS/$basearch/os">
       <signing key="file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-$releasever"/>
     </source>
   </repository>
-  <repository type="rpm-md" alias="appstream">
+  <repository type="rpm-md" alias="appstream" priority="1">
     <source path="https://download.rockylinux.org/stg/rocky/$releasever/AppStream/$basearch/os">
       <signing key="file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-$releasever"/>
     </source>
   </repository>
-  <repository type="rpm-md" alias="crb">
+  <repository type="rpm-md" alias="crb" priority="1">
     <source path="https://download.rockylinux.org/stg/rocky/$releasever/CRB/$basearch/os">
       <signing key="file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-$releasever"/>
     </source>
   </repository>
-  <repository type="rpm-md" alias="crb">
+  <repository type="rpm-md" alias="extras" priority="1">
     <source path="https://download.rockylinux.org/stg/rocky/$releasever/extras/$basearch/os">
       <signing key="file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-$releasever"/>
     </source>
diff --git a/repositories/epel.xml b/repositories/epel.xml
index 240fab7..f53c9f4 100644
--- a/repositories/epel.xml
+++ b/repositories/epel.xml
@@ -1,5 +1,5 @@
 <image>
-  <repository type="rpm-md" alias="epel">
+  <repository type="rpm-md" alias="epel" priority="2">
     <source path="https://dl.fedoraproject.org/pub/epel/$releasever/Everything/x86_64/">
       <signing key="file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever"/>
     </source>
diff --git a/repositories/oracle.xml b/repositories/oracle.xml
index 85544f7..e540611 100644
--- a/repositories/oracle.xml
+++ b/repositories/oracle.xml
@@ -1,6 +1,6 @@
 <!-- There isn't a way to exclude packages from a certain repo -->
 <image>
-  <repository type="rpm-md" alias="oraclelinux-addons">
+  <repository type="rpm-md" alias="oraclelinux-addons" priority="50">
     <source path="http://yum.oracle.com/repo/OracleLinux/OL$releasever/addons/$basearch/"/>
   </repository>
 </image>
diff --git a/repositories/sig-cloud-common.xml b/repositories/sig-cloud-common.xml
index 9c5704a..7f76a68 100644
--- a/repositories/sig-cloud-common.xml
+++ b/repositories/sig-cloud-common.xml
@@ -1,6 +1,6 @@
 <!-- There isn't a way to exclude packages from a certain repo -->
 <image>
-  <repository type="rpm-md" alias="sig-cloud-common">
+  <repository type="rpm-md" alias="sig-cloud-common" priority="5">
     <source path="http://dl.rockylinux.org/stg/sig/$releasever/cloud/$basearch/cloud-common"/>
   </repository>
 </image>