From 720935de06757c7e236e3d57a1fe21fef54dd8d2 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Mon, 23 Feb 2026 06:07:41 -0600 Subject: chore: make OVMF firmware paths configurable via environment Allow OVMF_CODE and OVMF_VARS_ORIG to be overridden via environment variables for portability across distros (Fedora, Ubuntu, etc. use different paths for UEFI firmware). --- scripts/full-test.sh | 6 +++--- scripts/sanity-test.sh | 6 +++--- scripts/test-install.sh | 6 +++--- scripts/test-vm.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/full-test.sh b/scripts/full-test.sh index e500116..d3d2440 100755 --- a/scripts/full-test.sh +++ b/scripts/full-test.sh @@ -33,9 +33,9 @@ VM_DISK_SIZE="20G" VM_RAM="4096" VM_CPUS="4" -# UEFI firmware -OVMF_CODE="/usr/share/edk2/x64/OVMF_CODE.4m.fd" -OVMF_VARS_ORIG="/usr/share/edk2/x64/OVMF_VARS.4m.fd" +# UEFI firmware (override via environment for non-Arch distros) +OVMF_CODE="${OVMF_CODE:-/usr/share/edk2/x64/OVMF_CODE.4m.fd}" +OVMF_VARS_ORIG="${OVMF_VARS_ORIG:-/usr/share/edk2/x64/OVMF_VARS.4m.fd}" # SSH settings SSH_PORT=2224 # Different port to avoid conflicts diff --git a/scripts/sanity-test.sh b/scripts/sanity-test.sh index b0aa0d7..95e537a 100755 --- a/scripts/sanity-test.sh +++ b/scripts/sanity-test.sh @@ -24,9 +24,9 @@ VM_RAM="2048" VM_CPUS="2" VM_NAME="archangel-sanity" -# UEFI firmware -OVMF_CODE="/usr/share/edk2/x64/OVMF_CODE.4m.fd" -OVMF_VARS_ORIG="/usr/share/edk2/x64/OVMF_VARS.4m.fd" +# UEFI firmware (override via environment for non-Arch distros) +OVMF_CODE="${OVMF_CODE:-/usr/share/edk2/x64/OVMF_CODE.4m.fd}" +OVMF_VARS_ORIG="${OVMF_VARS_ORIG:-/usr/share/edk2/x64/OVMF_VARS.4m.fd}" OVMF_VARS="$VM_DIR/sanity-test-OVMF_VARS.fd" # SSH settings diff --git a/scripts/test-install.sh b/scripts/test-install.sh index 0314bf2..fe5cc53 100755 --- a/scripts/test-install.sh +++ b/scripts/test-install.sh @@ -43,9 +43,9 @@ warn() { echo -e "${YELLOW}[WARN]${NC} $1"; } error() { echo -e "${RED}[ERROR]${NC} $1"; } step() { echo -e "${BLUE}[STEP]${NC} $1"; } -# UEFI firmware -OVMF_CODE="/usr/share/edk2/x64/OVMF_CODE.4m.fd" -OVMF_VARS_ORIG="/usr/share/edk2/x64/OVMF_VARS.4m.fd" +# UEFI firmware (override via environment for non-Arch distros) +OVMF_CODE="${OVMF_CODE:-/usr/share/edk2/x64/OVMF_CODE.4m.fd}" +OVMF_VARS_ORIG="${OVMF_VARS_ORIG:-/usr/share/edk2/x64/OVMF_VARS.4m.fd}" # Track test results TESTS_RUN=0 diff --git a/scripts/test-vm.sh b/scripts/test-vm.sh index 66dba37..7aa10db 100755 --- a/scripts/test-vm.sh +++ b/scripts/test-vm.sh @@ -24,9 +24,9 @@ VM_CPUS="4" MULTI_DISK=false NUM_DISKS=1 -# UEFI firmware (adjust path for your system) -OVMF_CODE="/usr/share/edk2/x64/OVMF_CODE.4m.fd" -OVMF_VARS_ORIG="/usr/share/edk2/x64/OVMF_VARS.4m.fd" +# UEFI firmware (override via environment for non-Arch distros) +OVMF_CODE="${OVMF_CODE:-/usr/share/edk2/x64/OVMF_CODE.4m.fd}" +OVMF_VARS_ORIG="${OVMF_VARS_ORIG:-/usr/share/edk2/x64/OVMF_VARS.4m.fd}" OVMF_VARS="$VM_DIR/OVMF_VARS.fd" # QEMU monitor socket for automation -- cgit v1.2.3