From 6d239b48e978fa1ff4f486e6b04069bd29c80270 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Mon, 27 Jun 2022 00:29:45 -0700
Subject: [PATCH] remove templates for xorr

---
 iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh | 4 ++--
 iso/empanadas/empanadas/util/iso_utils.py                 | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
index bef34c7..91631b2 100644
--- a/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
+++ b/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
@@ -7,12 +7,12 @@ mkdir -p {{ compose_work_iso_dir }}/{{ arch }}
 cd  {{ compose_work_iso_dir  }}/{{ arch }}
 {% else %}
 cd /builddir
-{% endif %}
-
 
 if ! TEMPLATE="$($(head -n1 $(which lorax) | cut -c3-) -c 'import pylorax; print(pylorax.find_templates())')"; then
   TEMPLATE="/usr/share/lorax"
 fi
+{% endif %}
+
 
 {{ make_image }} | tee -a {{ log_path }}
 
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 2c8acb1..48255fd 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -986,9 +986,6 @@ class IsoBuild:
             if 'genisoimage' in required_pkgs and 'xorriso' not in required_pkgs:
                 required_pkgs.append('xorriso')
 
-        if self.extra_iso_mode == 'podman':
-            required_pkgs.append('which')
-
         rclevel = ''
         if self.release_candidate:
             rclevel = '-' + self.rclvl