From 8ac9f54a49ef7bd97d18bd012fba999081ccca1d Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 1 May 2024 16:41:14 -0700
Subject: [PATCH] Use 9, make it easy

---
 README.md                               | 2 --
 components/live/cinnamon.xml            | 2 +-
 components/live/kde.xml                 | 2 +-
 components/live/mate.xml                | 2 +-
 components/live/workstation-lite.xml    | 2 +-
 components/live/workstation.xml         | 2 +-
 components/live/xfce.xml                | 2 +-
 configs/rocky-live-cinnamon.xml         | 2 +-
 configs/rocky-live-mate.xml             | 2 +-
 configs/rocky-live-workstation-lite.xml | 2 +-
 configs/rocky-live-workstation.xml      | 2 +-
 configs/rocky-live-xfce.xml             | 2 +-
 12 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index bd8cb4e..37e4653 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,6 @@ The below makes an XFCE live image using SIG/Core packages.
 % mock -r rl-9-x86_64-core-infra --shell --enable-network
 % git clone https://git.resf.org/sig_core/rocky-kiwi-descriptions -b r9
 % cd rocky-kiwi-descriptions
-% sed -i 's/ZZVOLVERZZ/9/g ; s/ZZVERZZ/9/g' $(find . -name "*.xml")
 % ln -sf configs/live-xfce.xml config.xml
 % kiwi-ng --debug --type="iso" \
   --profile="XFCE-Live" \
@@ -77,7 +76,6 @@ The below uses EPEL instead if you do not wish to use SIG/Core.
 % mock -r rocky+epel-9-x86_64 --shell --enable-network
 % git clone https://git.resf.org/sig_core/rocky-kiwi-descriptions -b r9
 % cd rocky-kiwi-descriptions
-% sed -i 's/ZZVOLVERZZ/9/g ; s/ZZVERZZ/9/g' $(find . -name "*.xml")
 % ln -sf configs/live-xfce.xml config.xml
 % kiwi-ng --debug --type="iso" \
   --profile="XFCE-Live" \
diff --git a/components/live/cinnamon.xml b/components/live/cinnamon.xml
index 97a053a..6dd9ccb 100644
--- a/components/live/cinnamon.xml
+++ b/components/live/cinnamon.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-Cinnamon" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-Cinnamon" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/components/live/kde.xml b/components/live/kde.xml
index 14b1292..c45a6d8 100644
--- a/components/live/kde.xml
+++ b/components/live/kde.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-KDE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-KDE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/components/live/mate.xml b/components/live/mate.xml
index 892fc6c..eb8bbf4 100644
--- a/components/live/mate.xml
+++ b/components/live/mate.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-MATE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-MATE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/components/live/workstation-lite.xml b/components/live/workstation-lite.xml
index c35c029..e848f23 100644
--- a/components/live/workstation-lite.xml
+++ b/components/live/workstation-lite.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-Workstation-Lite" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-Workstation-Lite" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/components/live/workstation.xml b/components/live/workstation.xml
index 7f7657d..585958f 100644
--- a/components/live/workstation.xml
+++ b/components/live/workstation.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-Workstation" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-Workstation" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/components/live/xfce.xml b/components/live/xfce.xml
index b606da2..6b10348 100644
--- a/components/live/xfce.xml
+++ b/components/live/xfce.xml
@@ -5,7 +5,7 @@
     </profile>
   </profiles>
   <preferences profiles="Live-Base">
-    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-XFCE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-9-XFCE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
       <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
     </type>
   </preferences>
diff --git a/configs/rocky-live-cinnamon.xml b/configs/rocky-live-cinnamon.xml
index d9f8067..eb4f88f 100644
--- a/configs/rocky-live-cinnamon.xml
+++ b/configs/rocky-live-cinnamon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="7.4" name="Rocky-ZZVERZZ-Cinnamon" displayname="Rocky Linux Cinnamon ZZVERZZ">
+<image schemaversion="7.4" name="Rocky-9-Cinnamon" displayname="Rocky Linux Cinnamon 9">
   <description type="system">
     <author>Release Engineering (SIG/Core)</author>
     <contact>releng@rockylinux.org</contact>
diff --git a/configs/rocky-live-mate.xml b/configs/rocky-live-mate.xml
index 42200e5..c07da93 100644
--- a/configs/rocky-live-mate.xml
+++ b/configs/rocky-live-mate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="7.4" name="Rocky-ZZVERZZ-MATE" displayname="Rocky Linux MATE ZZVERZZ">
+<image schemaversion="7.4" name="Rocky-9-MATE" displayname="Rocky Linux MATE 9">
   <description type="system">
     <author>Release Engineering (SIG/Core)</author>
     <contact>releng@rockylinux.org</contact>
diff --git a/configs/rocky-live-workstation-lite.xml b/configs/rocky-live-workstation-lite.xml
index 88d8bdc..9bd17c1 100644
--- a/configs/rocky-live-workstation-lite.xml
+++ b/configs/rocky-live-workstation-lite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="7.4" name="Rocky-ZZVERZZ-Workstation-Lite" displayname="Rocky Linux Workstation-Lite ZZVERZZ">
+<image schemaversion="7.4" name="Rocky-9-Workstation-Lite" displayname="Rocky Linux Workstation-Lite 9">
   <description type="system">
     <author>Release Engineering (SIG/Core)</author>
     <contact>releng@rockylinux.org</contact>
diff --git a/configs/rocky-live-workstation.xml b/configs/rocky-live-workstation.xml
index 70e55ae..9ccf74f 100644
--- a/configs/rocky-live-workstation.xml
+++ b/configs/rocky-live-workstation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="7.4" name="Rocky-ZZVERZZ-Workstation" displayname="Rocky Linux Workstation ZZVERZZ">
+<image schemaversion="7.4" name="Rocky-9-Workstation" displayname="Rocky Linux Workstation 9">
   <description type="system">
     <author>Release Engineering (SIG/Core)</author>
     <contact>releng@rockylinux.org</contact>
diff --git a/configs/rocky-live-xfce.xml b/configs/rocky-live-xfce.xml
index 1b8380b..c6327dc 100644
--- a/configs/rocky-live-xfce.xml
+++ b/configs/rocky-live-xfce.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="7.4" name="Rocky-ZZVERZZ-XFCE" displayname="Rocky Linux XFCE ZZVERZZ">
+<image schemaversion="7.4" name="Rocky-9-XFCE" displayname="Rocky Linux XFCE 9">
   <description type="system">
     <author>Release Engineering (SIG/Core)</author>
     <contact>releng@rockylinux.org</contact>