From 80381a6375909aa7b99dd27dbd03bf09b18340d3 Mon Sep 17 00:00:00 2001 From: MacRimi Date: Sat, 6 Sep 2025 11:32:07 +0200 Subject: [PATCH] Update share-common.func --- scripts/global/share-common.func | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/global/share-common.func b/scripts/global/share-common.func index 5c2405a..57f31c4 100644 --- a/scripts/global/share-common.func +++ b/scripts/global/share-common.func @@ -386,26 +386,25 @@ select_container_mount_point() { mount_point="/mnt/$mount_point" pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null ;; - 2) existing_dirs=$(pct exec "$ctid" -- find /mnt -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort) - if [[ -z "$existing_dirs" ]]; then whiptail --msgbox "$(translate "No existing directories found in /mnt")" 8 60 continue fi + options=() + while IFS= read -r dir; do + name=$(basename "$dir") + options+=("$dir" "$name") + done <<< "$existing_dirs" mount_point=$(whiptail --title "$(translate "Select Existing Folder")" \ - --menu "$(translate "Choose a folder from /mnt:")" 20 70 10 \ - $existing_dirs 3>&1 1>&2 2>&3) || continue + --menu "$(translate "Choose a folder from /mnt:")" 20 70 10 "${options[@]}" 3>&1 1>&2 2>&3) || continue ;; - 3) mount_point=$(whiptail --inputbox "$(translate "Enter full path:")" 10 70 "/mnt/shared" 3>&1 1>&2 2>&3) || continue [[ -z "$mount_point" ]] && continue - mount_point="/mnt/$mount_point" pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null ;; - 4) return 1 ;; @@ -424,6 +423,7 @@ select_container_mount_point() { + # ========================================================== # CLIENT MOUNT FUNCTIONS (NFS/SAMBA COMMON) # ==========================================================