From a28bed653a060b8692733f1bf0ad6082d9c90e11 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Mon, 20 Jun 2022 20:27:30 -0700
Subject: [PATCH] remove minimal as an image for now

---
 iso/empanadas/empanadas/configs/el9-beta.yaml |  1 -
 iso/empanadas/empanadas/configs/el9.yaml      |  1 -
 iso/empanadas/empanadas/configs/el9lh.yaml    |  1 -
 iso/empanadas/empanadas/util/iso_utils.py     | 17 +++++++++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index e8b76df..e1656c2 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -55,7 +55,6 @@
       s390x: ''
     images:
       - dvd
-      - minimal
     lorax_variants:
       - dvd
       - minimal
diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index 59d0ca8..3aeddb9 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -55,7 +55,6 @@
       s390x: ''
     images:
       - dvd
-      - minimal
     lorax_variants:
       - dvd
       - minimal
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index 71b8772..7029020 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -55,7 +55,6 @@
       s390x: ''
     images:
       - dvd
-      - minimal
     lorax_variants:
       - dvd
       - minimal
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index b344e80..ed0f7e5 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -461,7 +461,7 @@ class IsoBuild:
                 )
                 return
 
-        self.log.info('Downloading to: %s' % dest)
+        self.log.info('Downloading ({}) to: {}'.format(source, dest))
         try:
             self.s3.download_file(
                     Bucket=self.s3_bucket,
@@ -513,7 +513,7 @@ class IsoBuild:
                 return
         unurl = self.s3_bucket_url + '/' + source
 
-        self.log.info('Downloading to: %s' % dest)
+        self.log.info('Downloading ({}) to: {}'.format(source, dest))
         try:
             with requests.get(unurl, allow_redirects=True) as r:
                 with open(dest, 'wb') as f:
@@ -581,6 +581,15 @@ class IsoBuild:
         except:
             self.log.error('%s already exists??' % image)
 
+        self.log.info('Removing boot.iso from copy')
+        try:
+            os.remove(path_to_image + '/images/boot.iso')
+        except:
+            self.log.error(
+                        '[' + Color.BOLD + Color.YELLOW + 'FAIL' + Color.END + '] ' +
+                        'Cannot remove boot.iso'
+            )
+
     def run_boot_sync(self):
         """
         This unpacks into BaseOS/$arch/os, assuming there's no data actually
@@ -615,11 +624,11 @@ class IsoBuild:
         """
         self.log.info('Starting treeinfo work...')
 
-    def _treeinfo_from_lorax(self, arch, force_unpack):
+    def _treeinfo_from_lorax(self, arch, force_unpack, variant):
         """
         Fixes lorax treeinfo
         """
-        self.log.info('Fixing up lorax treeinfo for %s ...' % )
+        self.log.info('Fixing up lorax treeinfo for %s ...' % variant)
 
     def discinfo_write(self):
         """