particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel86+90: variable rename

Browse source 
Reflect the external name of the image type for clarity.
This commit is contained in:
Achilleas Koutsou 2022-02-16 16:36:42 +01:00 • committed by Christian Kellner
parent 62c44e86f9
commit 9a8271a524
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/rhel86/distro.go
View file

@ -1277,7 +1277,7 @@ func newDistro(distroName string) distro.Distro {
payloadPipelines: []string{"os", "root-tar"}, payloadPipelines: []string{"os", "root-tar"},
exports: []string{"root-tar"}, exports: []string{"root-tar"},
} }
tarInstallerImgTypeX86_64 := imageType{ imageInstaller := imageType{
name: "image-installer", name: "image-installer",
filename: "installer.iso", filename: "installer.iso",
mimeType: "application/x-iso9660-image", mimeType: "application/x-iso9660-image",
@ -1298,7 +1298,7 @@ func newDistro(distroName string) distro.Distro {
ociImgType := qcow2ImgType ociImgType := qcow2ImgType
ociImgType.name = "oci" 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) aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType)
ppc64le.addImageTypes(qcow2ImgType, tarImgType) ppc64le.addImageTypes(qcow2ImgType, tarImgType)
s390x.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType)

4
internal/distro/rhel90/distro.go
View file

@ -1257,7 +1257,7 @@ func newDistro(distroName string) distro.Distro {
payloadPipelines: []string{"os", "root-tar"}, payloadPipelines: []string{"os", "root-tar"},
exports: []string{"root-tar"}, exports: []string{"root-tar"},
} }
tarInstallerImgTypeX86_64 := imageType{ imageInstaller := imageType{
name: "image-installer", name: "image-installer",
filename: "installer.iso", filename: "installer.iso",
mimeType: "application/x-iso9660-image", mimeType: "application/x-iso9660-image",
@ -1278,7 +1278,7 @@ func newDistro(distroName string) distro.Distro {
ociImgType := qcow2ImgType ociImgType := qcow2ImgType
ociImgType.name = "oci" 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) aarch64.addImageTypes(qcow2ImgType, openstackImgType, amiImgTypeAarch64, tarImgType, edgeCommitImgType, edgeInstallerImgType, edgeOCIImgType, edgeRawImgType, edgeSimplifiedInstallerImgType)
ppc64le.addImageTypes(qcow2ImgType, tarImgType) ppc64le.addImageTypes(qcow2ImgType, tarImgType)
s390x.addImageTypes(qcow2ImgType, tarImgType) s390x.addImageTypes(qcow2ImgType, tarImgType)