From a950af34047b8ef1eb2dc2b414dfc0db38e45267 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 29 Jul 2022 21:58:10 -0700
Subject: [PATCH] fix naming for live images

---
 iso/empanadas/empanadas/util/iso_utils.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 32f4a63..8440548 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -1683,16 +1683,17 @@ class LiveBuild:
         )
         required_pkgs = self.livemap['required_pkgs']
 
-        volid = '{}-{}-{}'.format(
+        volid = '{}-{}-{}-{}'.format(
                 self.shortname,
-                image,
-                self.release
+                self.major_version,
+                self.minor_version,
+                image
         )
 
         isoname = '{}-{}-{}-{}-{}.iso'.format(
                 self.shortname,
-                image,
                 self.release,
+                image,
                 self.current_arch,
                 self.date
         )
@@ -1905,8 +1906,8 @@ class LiveBuild:
         live_dir_arch = os.path.join(self.live_work_dir, arch)
         isoname = '{}-{}-{}-{}-{}.iso'.format(
                 self.shortname,
-                image,
                 self.release,
+                image,
                 arch,
                 self.date
         )