mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
use bootc when available
This commit is contained in:
parent
c4a0406395
commit
efb32be6d3
2 changed files with 12 additions and 2 deletions
2
Makefile
2
Makefile
|
|
@ -39,7 +39,7 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t
|
||||||
|
|
||||||
# Step 1: Generate Lorax Templates
|
# Step 1: Generate Lorax Templates
|
||||||
lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
|
lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
|
||||||
$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED)
|
$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED IMAGE_REPO)
|
||||||
$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,18 @@
|
||||||
append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
|
append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "if (which bootc &> /dev/null)"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "then"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "bootc switch ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "else"
|
||||||
append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
|
append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "fi"
|
||||||
append usr/share/anaconda/interactive-defaults.ks "%end"
|
append usr/share/anaconda/interactive-defaults.ks "%end"
|
||||||
|
|
||||||
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
|
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
|
||||||
append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
|
append usr/share/anaconda/interactive-defaults.ks "if (which bootc &> /dev/null)"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "then"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "bootc switch ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "else"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
|
||||||
|
append usr/share/anaconda/interactive-defaults.ks "fi"
|
||||||
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end"
|
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue