From 8dd9321494d14d9b338778d7bd06e5706307e980 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:07:26 -0500 Subject: [PATCH] include top and bottom of post --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4eaba80..f6acfd4 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,24 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t # Step 1: Generate Lorax Templates lorax_templates/post_%.tmpl: lorax_templates/scripts/post/% # Support interactive-defaults.ks - while read -r line; do echo "append usr/share/anaconda/interactive-defaults.ks \"${line}\"" >> lorax_templates/post_$*.tmpl; done < lorax_templates/scripts/post/$* + $(eval _ISO_FILE = usr/share/anaconda/interactive-defaults.ks) + + echo "append $(_ISO_FILE) \"%post --erroronfail\"" >> lorax_templates/post_$*.tmpl + while read -r line; \ + do \ + echo "append $(_ISO_FILE) \"$$line\"" >> lorax_templates/post_$*.tmpl; \ + done < lorax_templates/scripts/post/$* + echo "append $(_ISO_FILE) \"%end\"" >> lorax_templates/post_$*.tmpl + # Support new Anacond method - while read -r line; do echo "append usr/share/anaconda/post-scripts/configure_upgrades.ks \"${line}\"" >> lorax_templates/post_$*.tmpl; done < lorax_templates/scripts/post/$* + $(eval _ISO_FILE = usr/share/anaconda/post-scripts/configure_upgrades.ks) + + echo "append $(_ISO_FILE) \"%post --erroronfail\"" >> lorax_templates/post_$*.tmpl + while read -r line; \ + do \ + echo "append $(_ISO_FILE) \"$$line\"" >> lorax_templates/post_$*.tmpl; \ + done < lorax_templates/scripts/post/$* + echo "append $(_ISO_FILE) \"%end\"" >> lorax_templates/post_$*.tmpl lorax_templates/%.tmpl: lorax_templates/%.tmpl.in $(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED)