From 950193a148ca4a2cf25792d0943d68635d51edf0 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Oct 08 2024 18:55:56 +0000
Subject: Revert "F42: update basename for IoT container"


This reverts commit 6ae099cb81cb5eaec69137d3c6dbcfd2ee3df370.

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index c7ead3d..11457e3 100644
--- a/fedora-iot.conf
+++ b/fedora-iot.conf
@@ -22,7 +22,7 @@ sigkeys = ['105ef944']
 tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"]
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
-tree_variants = ['IoT', 'bootc', 'IoT_bootc_base']
+tree_variants = ['IoT', 'bootc', 'bootc-base']
 hashed_directories = True
 
 # RUNROOT settings
@@ -282,7 +282,7 @@ ostree_container = {
         "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
         "failable": ['*'],
     },
-    "^IoT_bootc_base$": {
+    "^bootc-base$": {
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "config_url": "https://pagure.io/fedora-iot/ostree.git",
         "config_branch": "main",
diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh
index b69dabf..d232192 100755
--- a/sync-bootc-base-containers.sh
+++ b/sync-bootc-base-containers.sh
@@ -67,7 +67,7 @@ if [[ "${3}" == "-s" ]]; then
     stage="true"
 fi
 
-BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-IoT_bootc_base")
+BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-bootc-base")
 format="oci-archive"
 vers=${1}
 compose=${2}
@@ -181,7 +181,7 @@ for basename in "${BASENAMES[@]}"; do
 		registry_name="fedora-bootc"
 		compose_type="bootc"
 		ARCHES=("aarch64" "x86_64" "ppc64le" "s390x")
-	elif [[ ${basename} = "Fedora-IoT-IoT_bootc_base" ]]; then
+	elif [[ ${basename} = "Fedora-IoT-bootc-base" ]]; then
 		registry_name="fedora-iot"
 		compose_type="bootc-base"
 		ARCHES=("aarch64" "x86_64")
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 041f3ba..9deb115 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -7,7 +7,7 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant id="IoT_bootc_base" name="IoT_bootc_base" type="variant" is_empty="true">
+    <variant id="bootc-base" name="bootc-base" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>x86_64</arch>