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

use squashfs-only when not rhel

Browse source
This commit is contained in:
Jason N. 2024-04-09 15:20:14 -04:00
parent 40e0d375b2
commit 8c15653a75
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -36,7 +36,7 @@ _VOLID := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
export _RHEL := true
else
export _RHEL := false
undefine _RHEL
endif
ifeq ($(_RHEL),true)
@ -109,8 +109,8 @@ results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templat
$(if $(wildcard results), rm -Rf results)
$(if $(wildcard /etc/rpm/macros.image-language-conf),mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf)
lorax -p $(if $(findstring true,$(_RHEL)),RHEL,$(IMAGE_NAME)) -v $(VERSION) -r $(VERSION) $($(VARIANT),-t $(VARIANT)) \
--isfinal --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(PWD)/external/lorax/share/templates.d/99-generic \
lorax -p $(if $(_RHEL),RHEL,$(IMAGE_NAME)) -v $(VERSION) -r $(VERSION) $($(VARIANT),-t $(VARIANT)) \
--isfinal $(if $(_RHEL),,--squashfs-only) --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(PWD)/external/lorax/share/templates.d/99-generic \
$(_LORAX_ARGS) \
$(foreach file,$(_REPO_FILES),--repo $(PWD)/$(file)) \
$(foreach file,$(_LORAX_TEMPLATES),--add-template $(PWD)/$(file)) \