From d8081d762c8df797eeebf83828de06abf13a91cf Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 6 Jun 2026 15:56:41 -0500 Subject: [PATCH] added PVE-Shafred-Storage as default for DLDIR --- defaults.inc | 4 +++- proxmenu-scripts.sh | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index ad05902..224955c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,7 +3,7 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.5.28-5' +VERS='2026.6.6-1' noupdate=' ' @@ -21,6 +21,8 @@ else fi VIRTIO_FILE=${VIRTIO_DOWNLOAD_URL##*/} +[ -d /mnt/pve/PVE-Shared-Storage/template/iso ] && DLDIR=/mnt/pve/PVE-Shared-Storage/template/iso || DLDIR=/var/lib/vz/template/iso + # if [ -f /etc/apt/sources.list.d/gyptazy.list ]; then diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index ca8aa69..2c5ed4d 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -176,12 +176,12 @@ INSTALL_OMSA() { DOWNLOAD_VIRTIO() { echo -e "\n${idsCL[LightCyan]}Current \"Stable\" version available for download: ${idsCL[White]}${VIRTIO_FILE}${idsCL[Default]}" - if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then + if [ -f ${dldir}/${VIRTIO_FILE} ]; then echo -en "\n${idsCL[LightRed]}Removing existing download ... " - rm -f /var/lib/vz/template/iso/${VIRTIO_FILE} + rm -f ${DLDIR}/${VIRTIO_FILE} echo -e "${idsCL[Red]}Done${idsCL[Default]}" fi - wget -q -F -P /var/lib/vz/template/iso ${VIRTIO_DOWNLOAD_URL} & + wget -q -F -P ${DLDIR} ${VIRTIO_DOWNLOAD_URL} & echo -e "\n${idsCL[LightCyan]}Downloading will continue in the background\n" [ ${action-x} ] && exit 0 || ENTER2CONTINUE } @@ -302,9 +302,9 @@ MAIN_MENU() { else echo -e "${idsCL[DarkGray]} [2] Pulse Monitoring is already installed${idsCL[Default]}" fi - if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then + if [ -f ${DLDIR}/${VIRTIO_FILE} ]; then echo -e "${idsCL[DarkGray]} [3] Current VirtIO drivers already downloaded to 'local' on this host${idsCL[Default]}" - elif [ -f /var/lib/vz/template/iso/virtio*.iso ]; then + elif [ -f ${DLDIR}/virtio*.iso ]; then echo -e "${idsCL[White]} [${idsCL[LightYellow]}3${idsCL[Default]}] ${idsCL[LightGreen]}**${idsCL[White]}Download the available updated Win-VirtIO drivers to 'local' on this host${idsCL[Default]}" else echo -e "${idsCL[White]} [${idsCL[LightYellow]}3${idsCL[Default]}] ${idsCL[White]}Download the current Win-VirtIO drivers to 'local' on this host${idsCL[Default]}"