From 4ff70ba166fbd0e9e9e73cd2f06aebfdd1e0bcef Mon Sep 17 00:00:00 2001
From: MickLesk <mickey.leskowitz@gmail.com>
Date: Thu, 7 May 2026 11:24:02 +0200
Subject: [PATCH] Stop spinner on cleanup & simplify qm set

Call stop_spinner in cleanup() to ensure any active spinner is stopped on exit. Consolidate duplicated qm set branches in ubuntu2604-vm.sh into a single invocation to reduce code duplication and simplify VM disk/serial configuration. Remove the explicit ide2 cloudinit device and redundant cloud-init status messages; setup_cloud_init() is still invoked when USE_CLOUD_INIT is enabled, keeping cloud-init configuration centralized.
---
 misc/vm-core.func   |  1 +
 vm/ubuntu2604-vm.sh | 21 +++++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/misc/vm-core.func b/misc/vm-core.func
index 2c665814..1383c67e 100644
--- a/misc/vm-core.func
+++ b/misc/vm-core.func
@@ -560,6 +560,7 @@ cleanup_vmid() {
 
 cleanup() {
   local exit_code=$?
+  stop_spinner
   if [[ "$(dirs -p | wc -l)" -gt 1 ]]; then
     popd >/dev/null || true
   fi
diff --git a/vm/ubuntu2604-vm.sh b/vm/ubuntu2604-vm.sh
index 45c6ea85..48d691ee 100644
--- a/vm/ubuntu2604-vm.sh
+++ b/vm/ubuntu2604-vm.sh
@@ -147,29 +147,18 @@ qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE}
   -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID $FILE $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
-if [ "$USE_CLOUD_INIT" = "yes" ]; then
-  qm set $VMID \
-    -efidisk0 ${DISK0_REF}${FORMAT} \
-    -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
-    -ide2 ${STORAGE}:cloudinit \
-    -boot order=scsi0 \
-    -serial0 socket >/dev/null
-else
-  qm set $VMID \
-    -efidisk0 ${DISK0_REF}${FORMAT} \
-    -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
-    -boot order=scsi0 \
-    -serial0 socket >/dev/null
-fi
+qm set $VMID \
+  -efidisk0 ${DISK0_REF}${FORMAT} \
+  -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
+  -boot order=scsi0 \
+  -serial0 socket >/dev/null
 set_description
 
 msg_info "Resizing disk to $DISK_SIZE"
 qm resize $VMID scsi0 ${DISK_SIZE} >/dev/null
 
 if [ "$USE_CLOUD_INIT" = "yes" ] && declare -f setup_cloud_init >/dev/null 2>&1; then
-  msg_info "Configuring Cloud-Init"
   setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes" "${CLOUDINIT_USER:-ubuntu}" "${CLOUDINIT_NETWORK_MODE:-dhcp}" "${CLOUDINIT_IP:-}" "${CLOUDINIT_GW:-}" "${CLOUDINIT_DNS:-${CLOUDINIT_DNS_SERVERS:-1.1.1.1 8.8.8.8}}"
-  msg_ok "Configured Cloud-Init"
 fi
 
 msg_ok "Created a Ubuntu 26.04 VM ${CL}${BL}(${HN})"