From 1d3f45f7928c2be175958ba010ba920959c5c240 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Sat, 14 Feb 2026 14:58:11 +0100
Subject: [PATCH] Use local ISO cache; remove ISO storage selection

Remove interactive ISO storage detection/selection and associated ISO_PATH logic. Default to a fixed cache directory (/var/lib/vz/template/iso) via CACHE_DIR and update CACHE_FILE and mkdir usage accordingly. Also update VM configuration to reference the local ISO store (local:iso/<file>) instead of the previously selectable storage. This simplifies ISO handling by avoiding pvesm/whiptail prompts; note this hardcodes the ISO location and removes support for alternate ISO storages.
---
 vm/cachyos-vm.sh | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/vm/cachyos-vm.sh b/vm/cachyos-vm.sh
index 7b341ccb2..baf04b8ce 100644
--- a/vm/cachyos-vm.sh
+++ b/vm/cachyos-vm.sh
@@ -462,37 +462,6 @@ fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
 
-# ==============================================================================
-# ISO STORAGE SELECTION
-# ==============================================================================
-msg_info "Validating ISO Storage"
-ISO_STORAGE_MENU=()
-while read -r line; do
-  TAG=$(echo $line | awk '{print $1}')
-  TYPE=$(echo $line | awk '{printf "%-10s", $2}')
-  FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
-  ITEM="  Type: $TYPE Free: $FREE "
-  ISO_STORAGE_MENU+=("$TAG" "$ITEM" "OFF")
-done < <(pvesm status -content iso | awk 'NR>1')
-ISO_VALID=$(pvesm status -content iso | awk 'NR>1')
-if [ -z "$ISO_VALID" ]; then
-  msg_error "Unable to detect a valid ISO storage location."
-  exit 1
-elif [ $((${#ISO_STORAGE_MENU[@]} / 3)) -eq 1 ]; then
-  ISO_STORAGE=${ISO_STORAGE_MENU[0]}
-else
-  while [ -z "${ISO_STORAGE:+x}" ]; do
-    ISO_STORAGE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "ISO Storage" --radiolist \
-      "Select storage for CachyOS ISO download:\n" \
-      16 60 6 \
-      "${ISO_STORAGE_MENU[@]}" 3>&1 1>&2 2>&3)
-  done
-fi
-msg_ok "Using ${CL}${BL}$ISO_STORAGE${CL} ${GN}for ISO Storage."
-
-# Get ISO storage path
-ISO_PATH=$(pvesm path ${ISO_STORAGE}:iso/ 2>/dev/null | sed 's|/$||') || ISO_PATH="/var/lib/vz/template/iso"
-
 # ==============================================================================
 # ISO DOWNLOAD
 # ==============================================================================
@@ -504,9 +473,10 @@ CACHYOS_VERSION=$(curl -fsSL "https://sourceforge.net/projects/cachyos-arch/file
 # SourceForge download URL with mirror redirect
 URL="https://sourceforge.net/projects/cachyos-arch/files/gui-installer/desktop/${CACHYOS_VERSION}/cachyos-desktop-linux-${CACHYOS_VERSION}.iso/download"
 FILENAME="cachyos-desktop-linux-${CACHYOS_VERSION}.iso"
-CACHE_FILE="${ISO_PATH}/${FILENAME}"
+CACHE_DIR="/var/lib/vz/template/iso"
+CACHE_FILE="${CACHE_DIR}/${FILENAME}"
 
-mkdir -p "$ISO_PATH"
+mkdir -p "$CACHE_DIR"
 msg_ok "${CL}${BL}CachyOS Desktop ISO (Release: ${CACHYOS_VERSION})${CL}"
 
 if [[ -s "$CACHE_FILE" ]]; then
@@ -571,7 +541,7 @@ pvesm alloc $STORAGE $VMID $DISK1 ${DISK_SIZE} 1>&/dev/null
 qm set $VMID \
   -efidisk0 ${DISK0_REF}${FORMAT} \
   -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
-  -ide2 ${ISO_STORAGE}:iso/${FILENAME},media=cdrom \
+  -ide2 local:iso/${FILENAME},media=cdrom \
   -boot order=ide2 \
   -serial0 socket \
   -vga qxl \