From 99299d78843e37d76388bb3a6e79a92eab9efc0d Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 13 Jan 2023 00:13:36 -0700
Subject: [PATCH] correct volid names

---
 r8-beta.conf | 13 ++++++-------
 r8lh.conf    | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/r8-beta.conf b/r8-beta.conf
index 8a891ff..4120d9f 100644
--- a/r8-beta.conf
+++ b/r8-beta.conf
@@ -7,7 +7,6 @@ release_name = "Rocky Linux"
 release_short = "Rocky"
 release_version = "8.8"
 version = "8.8"
-rl_release_type = "BETA"
 
 # GENERAL SETTINGS
 comps_file = {
@@ -110,12 +109,12 @@ buildinstall_skip = [
 ]
 
 image_name_format = {
-    "^BaseOS$": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
-    "^Minimal$": "{release_short}-8.8-{rl_release_type}-{arch}-minimal{suffix}",
-    ".*": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
+    "^BaseOS$": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
+    "^Minimal$": "{release_short}-8.8-BETA-{arch}-minimal{suffix}",
+    ".*": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
-image_volid_formats = [ '{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}', ]
+image_volid_formats = [ '{release_short}-8.8-BETA-{arch}-{disc_type}', ]
 
 # CREATEISO
 create_optional_isos = False
@@ -130,12 +129,12 @@ createiso_skip = [
 extra_isos = {
     "BaseOS": [{
         "include_variants": ["AppStream"],
-        "filename": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
+        "filename": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
         "skip_src": True,
     }],
     "Minimal": [{
         "include_variants": ["BaseOS"],
-        "filename": "{release_short}-8.8-{rl_release_type}-{arch}-minimal{suffix}",
+        "filename": "{release_short}-8.8-BETA-{arch}-minimal{suffix}",
         "skip_src": True,
     }]
 }
diff --git a/r8lh.conf b/r8lh.conf
index c9156a2..cd321c9 100644
--- a/r8lh.conf
+++ b/r8lh.conf
@@ -7,7 +7,6 @@ release_name = "Rocky Linux"
 release_short = "Rocky"
 release_version = "8.8"
 version = "8.8"
-rl_release_type = "LookAhead"
 
 # GENERAL SETTINGS
 comps_file = {
@@ -110,12 +109,12 @@ buildinstall_skip = [
 ]
 
 image_name_format = {
-    "^BaseOS$": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
-    "^Minimal$": "{release_short}-8.8-{rl_release_type}-{arch}-minimal{suffix}",
-    ".*": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
+    "^BaseOS$": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
+    "^Minimal$": "{compose_id}-{arch}-minimal{suffix}",
+    ".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
-image_volid_formats = [ '{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}', ]
+image_volid_formats = [ '{compose_id}-{arch}-{disc_type}', ]
 
 # CREATEISO
 create_optional_isos = False
@@ -130,12 +129,12 @@ createiso_skip = [
 extra_isos = {
     "BaseOS": [{
         "include_variants": ["AppStream"],
-        "filename": "{release_short}-8.8-{rl_release_type}-{arch}-{disc_type}{disc_num}{suffix}",
+        "filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
         "skip_src": True,
     }],
     "Minimal": [{
         "include_variants": ["BaseOS"],
-        "filename": "{release_short}-8.8-{rl_release_type}-{arch}-minimal{suffix}",
+        "filename": "{compose_id}-{arch}-minimal{suffix}",
         "skip_src": True,
     }]
 }