From fcc050ed82b01709fdf9150de720aa173e2150d9 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Thu, 7 Oct 2021 15:54:24 +0100
Subject: [PATCH] When deleting a disk, also remove the EFI vars
---
quickemu | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/quickemu b/quickemu
index a843cb3..74a2d83 100755
--- a/quickemu
+++ b/quickemu
@@ -4,6 +4,11 @@ export LC_ALL=C
function disk_delete() {
if [ -e "${disk_img}" ]; then
rm "${disk_img}"
+ # Remove any EFI vars, but not for macOS
+ rm "${VMDIR}/OVMF_VARS_4M.fd" >/dev/null 2>&1
+ rm "${VMPATH}/${VMDIR}/OVMF_VARS_4M.fd" >/dev/null 2>&1
+ rm "${VMDIR}/${VMNAME}-vars.fd" >/dev/null 2>&1
+ rm "${VMPATH}/${VMDIR}/${VMNAME}-vars.fd" > /dev/null 2>&1
echo "SUCCESS! Deleted ${disk_img}"
else
echo "NOTE! ${disk_img} not found. Doing nothing."
@@ -135,10 +140,6 @@ function check_cpu_flag() {
}
function vm_boot() {
- local VMNAME=""
- VMNAME=$(basename "${VM}" .conf)
- local VMDIR=""
- VMDIR=$(dirname "${disk_img}")
local BALLOON="-device virtio-balloon"
local CPU=""
local GUEST_CPU_CORES=""
@@ -794,6 +795,9 @@ SNAPSHOT_TAG=""
STATUS_QUO=""
USB_PASSTHROUGH=""
VM=""
+VMDIR=""
+VMNAME=""
+VMPATH=""
readonly LAUNCHER=$(basename "${0}")
readonly DISK_MIN_SIZE=$((197632 * 8))
@@ -899,6 +903,10 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
exit 1
fi
+ VMDIR=$(dirname "${disk_img}")
+ VMNAME=$(basename "${VM}" .conf)
+ VMPATH=$(dirname "${VM}")
+
# Backwards compatibility for ${driver_iso}
if [ -n "${driver_iso}" ] && [ -z "${fixed_iso}" ]; then
fixed_iso="${driver_iso}"