From 29870031a4aa0702515f9efbc72b1640336e89b6 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Apr 07 2022 18:08:13 +0000
Subject: Re-add shortname, remove variant from artifact names


Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index 926f07a..9dd2805 100644
--- a/fedora-iot.conf
+++ b/fedora-iot.conf
@@ -1,6 +1,6 @@
 # PRODUCT INFO
 release_name = 'Fedora-IoT'
-release_short = 'Fedora'
+release_short = 'Fedora-IoT'
 release_version = '37'
 # Let's not build install media during this run. For the image builds
 # and OSTree installer we'll use inputs from other f37 runs.
@@ -60,7 +60,7 @@ repoclosure_backend = 'dnf'
 # CHECKSUMS
 media_checksums = ['sha256']
 media_checksum_one_file = True
-media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s'
+media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s'
 #jigdo
 create_jigdo = False
 
@@ -149,10 +149,10 @@ createiso_skip = [
 #]
 
 # Image name respecting Fedora's image naming policy
-image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'
+image_name_format = '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'
 # # Use the same format for volume id
 image_volid_formats = [
-     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s'
      ]
 # No special handling for layered products, use same format as for regular images
 image_volid_layered_product_formats = []