From 73dd52e04eada665d57a512940f63d40a61b5936 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Sun, 30 Aug 2026 12:09:47 +0200 Subject: [PATCH] feat(deploy): generate dishes before deploy and fix dish selection - deploy.sh now runs 'make all' in cook/ before deploying, since dishes are build products no longer tracked in git; failures show the make output and abort - deploy-distro.sh selects dishes by the *guest-agents* marker (the new naming replaced the virtual* prefix) and uses --os-variant fedora-unknown instead of the stale fedora41 pin --- deploy.sh | 6 ++++++ deploy/deploy-distro.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index c1e80f1..2144f26 100755 --- a/deploy.sh +++ b/deploy.sh @@ -11,6 +11,12 @@ execute_script() { return 0 # Indicate success } +# Generate recipes and dishes before deployment (they are build products) +if ! (cd cook && make all); then + echo "Failed to generate dishes in cook/ (see 'make all' in cook/)" + exit 1 +fi + # Array of scripts scripts=( "./deploy/install-prerequisites-on-linux.sh" diff --git a/deploy/deploy-distro.sh b/deploy/deploy-distro.sh index 734e314..7194f1c 100755 --- a/deploy/deploy-distro.sh +++ b/deploy/deploy-distro.sh @@ -142,7 +142,7 @@ fi echo "You selected: $uri" # Get a list of files in "dishes" directory -mapfile -t dish_name < <(find "cook/dishes/" -maxdepth 1 -type f \( -name "virtual*" \) -printf "%f\n" | sed 's/\.[^.]*$//') +mapfile -t dish_name < <(find "cook/dishes/" -maxdepth 1 -type f \( -name "*guest-agents*" \) -printf "%f\n" | sed 's/\.[^.]*$//') # Check if there are any files if [ ${#dish_name[@]} -eq 0 ]; then @@ -191,7 +191,7 @@ fi # virt-install command with user-defined VM name virt-install \ --connect "$uri" \ - --os-variant fedora41 \ + --os-variant fedora-unknown \ --virt-type kvm \ --arch x86_64 \ --machine q35 \