From 57ba3ca98c2864f3bd7fceb44a4ca77a18740421 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Sat, 19 Nov 2022 17:09:00 -0500
Subject: [PATCH] rename metadata file to not conflict

---
 iso/empanadas/empanadas/scripts/build_image.py     | 4 ++--
 iso/empanadas/empanadas/templates/vagrant/vmx.tmpl | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py
index aff2c6d..c889c21 100644
--- a/iso/empanadas/empanadas/scripts/build_image.py
+++ b/iso/empanadas/empanadas/scripts/build_image.py
@@ -94,7 +94,7 @@ class ImageBuild:
         self.package_args = self._package_args()
         self.common_args = self._common_args()
 
-        self.metadata = pathlib.Path(self.outdir, "metadata.json")
+        self.metadata = pathlib.Path(self.outdir, ".imagefactory-metadata.json")
 
         self.kickstart_path = pathlib.Path(f"{KICKSTART_PATH}/Rocky-{self.architecture.major}-{self.type_variant}.ks")
 
@@ -443,7 +443,7 @@ class ImageBuild:
         return template
 
     def save(self):
-        with open(pathlib.Path(self.outdir, "metadata.json"), "w") as f:
+        with open(self.metadata, "w") as f:
             try: 
                 o = { name: getattr(self, name) for name in ["base_uuid", "target_uuid"] }
                 log.debug(o)
diff --git a/iso/empanadas/empanadas/templates/vagrant/vmx.tmpl b/iso/empanadas/empanadas/templates/vagrant/vmx.tmpl
index 1c58ff5..16f4625 100644
--- a/iso/empanadas/empanadas/templates/vagrant/vmx.tmpl
+++ b/iso/empanadas/empanadas/templates/vagrant/vmx.tmpl
@@ -53,7 +53,7 @@ vmci0.id = "-1024033366"
 vmci0.present = "TRUE"
 vmotion.checkpointFBSize = "134217728"
 
-displayName = "{{ outname }}"
-nvram = "{{ outname }}.nvram"
-scsi0:0.fileName = "{{ outname }}.vmdk"
-extendedConfigFile = "{{ outname }}.vmxf"
+displayName = "{{ name }}"
+nvram = "{{ name }}.nvram"
+scsi0:0.fileName = "{{ name }}.vmdk"
+extendedConfigFile = "{{ name }}.vmxf"