From 9a8271a52426418f18dbc7b8ca2cf7ef32c49743 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Wed, 16 Feb 2022 16:36:42 +0100 Subject: [PATCH] distro/rhel86+90: variable rename Reflect the external name of the image type for clarity. --- internal/distro/rhel86/distro.go | 4 ++-- internal/distro/rhel90/distro.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/distro/rhel86/distro.go b/internal/distro/rhel86/distro.go index 74bdd89dd..62526c0c1 100644 --- a/internal/distro/rhel86/distro.go +++ b/internal/distro/rhel86/distro.go @@ -1277,7 +1277,7 @@ func newDistro(distroName string) distro.Distro { payloadPipelines: []string{"os", "root-tar"}, exports: []string{"root-tar"}, } - tarInstallerImgTypeX86_64 := imageType{ + imageInstaller := imageType{ name: "image-installer", filename: "installer.iso", mimeType: "application/x-iso9660-image", @@ -1298,7 +1298,7 @@ func newDistro(distroName string) distro.Distro { ociImgType := qcow2ImgType ociImgType.name = "oci" - x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, tarInstallerImgTypeX86_64, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType, ociImgType) + x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, imageInstaller, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType, ociImgType) aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType) ppc64le.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType) diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index 6c879d186..43a5a34a9 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -1257,7 +1257,7 @@ func newDistro(distroName string) distro.Distro { payloadPipelines: []string{"os", "root-tar"}, exports: []string{"root-tar"}, } - tarInstallerImgTypeX86_64 := imageType{ + imageInstaller := imageType{ name: "image-installer", filename: "installer.iso", mimeType: "application/x-iso9660-image", @@ -1278,7 +1278,7 @@ func newDistro(distroName string) distro.Distro { ociImgType := qcow2ImgType ociImgType.name = "oci" - x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, tarInstallerImgTypeX86_64, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType, ociImgType) + x86_64.addImageTypes(qcow2ImgType, vhdImgType, vmdkImgType, openstackImgType, amiImgTypeX86_64, tarImgType, imageInstaller, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType, ociImgType) aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType) ppc64le.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType)