From 235440fcf7100892e4bbb5f183c811a8604fb045 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 17 Jan 2024 10:42:11 -0700
Subject: [PATCH] sync 10

---
 rocky.conf           | 12 +++++++++++-
 rocky/override.conf  | 14 +++++++++++++-
 rocky/variables.conf | 10 +++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/rocky.conf b/rocky.conf
index e7e5f20..d00697d 100644
--- a/rocky.conf
+++ b/rocky.conf
@@ -1,5 +1,15 @@
+# This is the default CentOS Stream config template.
+#
+# DO NOT EDIT this configuration file directly.
+#
+# For any change which should be propagated also into CentOS and RHEL
+# compose, edit the particular configuration file in the "shared" directory.
+#
+# For any change which should happen only for CentOS Stream, edit the
+# "centos/override.conf" configuration file.
+
 from shared/variables import *
-from rocky/variables import *
+from rock/variables import *
 from shared/all import *
 from rocky/override import *
 
diff --git a/rocky/override.conf b/rocky/override.conf
index 5174cc8..6de26a0 100644
--- a/rocky/override.conf
+++ b/rocky/override.conf
@@ -1,7 +1,8 @@
 # This files overrides default variables defined in the configs in
 # the ../shared directory.
 
-#from images import *
+# No images for now
+# from images import *
 
 # Unsigned builds for now
 sigkeys = [None]
@@ -10,6 +11,17 @@ tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
 
 lorax_use_koji_plugin = False
 
+lorax_options = [
+    ("^.*$", {
+        'x86_64': {
+            'nomacboot': True
+        },
+        "*": {
+            "noupgrade": False
+        }
+    })
+]
+
 translate_paths = [ # required by image-build
     ("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
 ]
diff --git a/rocky/variables.conf b/rocky/variables.conf
index ef824a1..5281d07 100644
--- a/rocky/variables.conf
+++ b/rocky/variables.conf
@@ -4,21 +4,17 @@
 RELEASE_NAME = 'Rocky Linux'
 RELEASE_SHORT = 'Rocky'
 RELEASE_VERSION = '10'
-VERSION = '10-lh'
 
-PKGSET_KOJI_TAG = 'r10-bootstrap'
+PKGSET_KOJI_TAG = 'r10s-bootstrap'
 
 RUNROOT_CHANNEL = 'runroot'
-RUNROOT_TAG = 'r10-build'
+RUNROOT_TAG = 'r10s-build'
 
 COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git'
 COMPS_BRANCH = 'main'
 COMPS_FILE = 'comps-rocky-%s.xml' % VERSION
 COMPS_COMMAND = ''
 
-MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git'
-MODULE_DEFAULTS_BRANCH = 'r10s'
-
 VARIANTS_SCM = 'git'
 VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
 VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION
@@ -33,7 +29,7 @@ EXTRA_FILES = [
     {
         "scm": "git",
         "repo": "https://git.rockylinux.org/staging/src/rocky-release.git",
-        "branch": "r10",
+        "branch": "r10s",
         "file": [
             "SOURCES/LICENSE",
             "SOURCES/EULA",