actions/build-container-installer
1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00
Code Releases Activity

move condition

Browse source
This commit is contained in:
Jason N. 2024-03-07 13:50:52 -05:00
parent 80a1e2786e
commit 0be99528ef
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -45,6 +45,13 @@ _LORAX_ARGS += --cachedir $(DNF_CACHE)
_LORAX_TEMPLATES += lorax_templates/copy_dnf_cache.tmpl _LORAX_TEMPLATES += lorax_templates/copy_dnf_cache.tmpl
endif endif
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
_PLATFORM_ID = platform:el$(VERSION)
else
_PLATFORM_ID = platform:f$(VERSION)
endif
# Step 7: Buid end ISO # Step 7: Buid end ISO
## Default action ## Default action
build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
@ -139,11 +146,7 @@ boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
rm -Rf $(_BASE_DIR)/results || true rm -Rf $(_BASE_DIR)/results || true
mv /etc/rpm/macros.image-language-conf /etc/rpm/macros.image-language-conf.orig || true mv /etc/rpm/macros.image-language-conf /etc/rpm/macros.image-language-conf.orig || true
cp /etc/dnf/dnf.conf /etc/dnf/dnf.conf.orig || true cp /etc/dnf/dnf.conf /etc/dnf/dnf.conf.orig || true
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo) echo "module_platform_id=$(_PLATFORM_ID) >> /etc/dnf/dnf.conf
echo "module_platform_id=platform:el${VERSION} >> /etc/dnf/dnf.conf
else
echo "module_platform_id=platform:f${VERSION} >> /etc/dnf/dnf.conf
endif
# Download the secure boot key # Download the secure boot key
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \ if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \