From 922f8add5f634069a51c99a75b2ce10b77614f04 Mon Sep 17 00:00:00 2001
From: juvdiaz <juvenal.diaz@oracle.com>
Date: Tue, 26 May 2026 13:49:58 -0600
Subject: [PATCH] Fix arm64 PXE GRUB config path

---
 bootstrap/provisioning/main.tf | 9 +++++++--
 lab.sh                         | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bootstrap/provisioning/main.tf b/bootstrap/provisioning/main.tf
index b4c5941..0b00d64 100644
--- a/bootstrap/provisioning/main.tf
+++ b/bootstrap/provisioning/main.tf
@@ -404,7 +404,7 @@ resource "null_resource" "provisioning_host" {
     http_port           = tostring(var.http_port)
     config_hash         = local.config_hash
     provisioning_layer  = "1"
-    provisioner_version = "2"
+    provisioner_version = "3"
   }
 
   connection {
@@ -482,6 +482,7 @@ sudo install -d -m 0755 \
   "$install_dir" \
   "$tftp_root" \
   "$tftp_root/debian-installer/arm64" \
+  "$tftp_root/debian-installer/arm64/grub" \
   "$tftp_root/grub" \
   "$http_root" \
   "$http_root/preseed" \
@@ -489,10 +490,14 @@ sudo install -d -m 0755 \
   "$http_root/debian-installer/arm64"
 
 sudo cp "$tmp_dir/grub.cfg" "$tftp_root/grub/grub.cfg"
+sudo cp "$tmp_dir/grub.cfg" "$tftp_root/debian-installer/arm64/grub/grub.cfg"
 sudo cp "$tmp_dir/preseed.cfg" "$http_root/preseed/debian13-arm64-worker.cfg"
 sudo cp "$tmp_dir/golden-node-prepare.sh" "$http_root/scripts/golden-node-prepare.sh"
 sudo cp "$tmp_dir/prepare-template.sh" "$http_root/scripts/prepare-template.sh"
-sudo chmod 0644 "$tftp_root/grub/grub.cfg" "$http_root/preseed/debian13-arm64-worker.cfg"
+sudo chmod 0644 \
+  "$tftp_root/grub/grub.cfg" \
+  "$tftp_root/debian-installer/arm64/grub/grub.cfg" \
+  "$http_root/preseed/debian13-arm64-worker.cfg"
 sudo chmod 0755 "$http_root/scripts/golden-node-prepare.sh" "$http_root/scripts/prepare-template.sh"
 
 for asset in linux initrd.gz "$pxe_boot_file"; do
diff --git a/lab.sh b/lab.sh
index ca8e7a2..761359d 100755
--- a/lab.sh
+++ b/lab.sh
@@ -285,6 +285,7 @@ run_pimox_pipeline() {
     local bridge="${LAB_PIMOX_BRIDGE:-${TF_VAR_pimox_template_bridge:-vmbr0}}"
     local template_vmid="${LAB_PIMOX_TEMPLATE_VMID:-${TF_VAR_pimox_template_vmid:-9000}}"
     local template_name="${LAB_PIMOX_TEMPLATE_NAME:-${TF_VAR_pimox_template_name:-debian13-arm64-k8s-template}}"
+    local template_replace_existing="${LAB_PIMOX_TEMPLATE_REPLACE_EXISTING:-${TF_VAR_pimox_template_replace_existing:-false}}"
     local provisioning_interface
     local worker_count="${LAB_PIMOX_WORKER_COUNT:-1}"
     local worker_base_vmid="${LAB_PIMOX_WORKER_BASE_VMID:-9010}"
@@ -356,6 +357,7 @@ fi" 2>&1)"
     export TF_VAR_pimox_template_bridge="${bridge}"
     export TF_VAR_pimox_template_vmid="${template_vmid}"
     export TF_VAR_pimox_template_name="${template_name}"
+    export TF_VAR_pimox_template_replace_existing="${template_replace_existing}"
     export TF_VAR_pimox_template_builder_enabled="${TF_VAR_pimox_template_builder_enabled:-true}"
     export TF_VAR_pimox_template_build_ssh_key_path="${TF_VAR_pimox_template_build_ssh_key_path:-${worker_key_path}}"
     export TF_VAR_pimox_template_build_user="${TF_VAR_pimox_template_build_user:-${worker_user}}"