From 3eae48fcfb10b2cc6fe1350d632e671a70c1a2e7 Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Sat, 26 Apr 2025 09:07:51 +0200 Subject: [PATCH] Fix Makefile --- Makefile | 3 +-- airootfs/root/install.sh | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c8c8768..e16857f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ iso: - sed "s|%REL_VER%|$(grep -E 'release_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|" template/root/install.sh > airootfs/root/install.sh - sed "s|%ALP_VER%|$(grep -E 'iso_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|" template/root/install.sh > airootfs/root/install.sh + sed "s|%REL_VER%|$(shell grep -E 'release_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|; s|%ALP_VER%|$(shell grep -E 'iso_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|" template/root/install.sh > airootfs/root/install.sh sudo mkalpineiso -o ${PWD}/out clean: diff --git a/airootfs/root/install.sh b/airootfs/root/install.sh index ad33e36..1c5b750 100644 --- a/airootfs/root/install.sh +++ b/airootfs/root/install.sh @@ -154,7 +154,7 @@ function preChecks() { function introDialogue() { local introtext="\n\n\n Velkommen til - _ _\n + _ _\n | \ | | _____ _____ ___\n | \| |/ _ \ \ / / _ \/ __|\n | |\ | (_) \ V / (_) \__ \ \n @@ -420,6 +420,8 @@ ungrouped: tmpfs_size: 4G installation_type: ${INSTALLATION_TYPE} mysql_root_password: $(randomPasswordGen 32) + release_version: 2412 + alpine_version: v3.21 EOT installationSubtaskTitle "Execute Ansible playbooks"