Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-09-29 18:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from f3rs3n/fix/vm-storage-selection-messages

Browse Source 
Clarify VM storage selection and fix translation lookups
This commit is contained in:
MacRimi
2026-09-22 19:21:45 +02:00
committed by GitHub
parent 24a2557d8e eb13ca620e
commit e6d3f2e3cb
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/help_info_menu.sh
+1 -1
View File
@@ -382,7 +382,7 @@ show_storage_commands() {
echo -en "\n${TAB}${BOLD}${YW}${HOLD}$(translate 'Enter full path to the disk image (e.g., /var/lib/vz/images/xyz.img): ')${CL}"
read -r image_path
echo -e "\n${YELLOW}$(translate 'Available storage volumes:')${NC}"
echo -e "\n${YELLOW}$(translate 'Storage IDs:')${NC}"
pvesm status | awk 'NR>1 {print " - "$1}'
echo -en "\n${TAB}${BOLD}${YW}${HOLD}$(translate 'Enter target storage name (e.g., local-lvm): ')${CL}"
scripts/vm/disk_selector.sh
+3 -3
View File
@@ -141,7 +141,7 @@ function select_disk_type() {
# Select Virtual Disks
# ==========================================================
function select_virtual_disk() {
msg_info "Detecting available storage volumes..."
msg_info "$(translate "Detecting storage for disk images...")"
local STORAGE_MENU=()
local TAG TYPE FREE ITEM
@@ -165,8 +165,8 @@ function select_virtual_disk() {
STORAGE=${STORAGE_MENU[0]}
else
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" >/dev/null 2>&1
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage Volume")" --radiolist \
"$(translate "Choose the storage volume for the virtual disk:\n")" 20 78 10 \
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage")" --radiolist \
"$(translate "Choose the storage for the virtual disk:")"$'\n' 20 78 10 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3)
if [ $? -ne 0 ] || [ -z "$STORAGE" ]; then
scripts/vm/synology.sh
+6 -6
View File
@@ -540,7 +540,7 @@ function select_disk_type() {
}
function select_virtual_disk() {
msg_info "Detecting available storage volumes..."
msg_info "$(translate "Detecting storage for disk images...")"
local STORAGE_MENU=()
local TAG TYPE FREE ITEM
@@ -564,8 +564,8 @@ function select_virtual_disk() {
STORAGE=${STORAGE_MENU[0]}
else
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" >/dev/null 2>&1
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage Volume")" --radiolist \
"$(translate "Choose the storage volume for the virtual disk:\n")" 20 78 10 \
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage")" --radiolist \
"$(translate "Choose the storage for the virtual disk:")"$'\n' 20 78 10 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || return 0
[[ -z "$STORAGE" ]] && return 0
fi
@@ -953,7 +953,7 @@ function select_efi_storage() {
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" > /dev/null 2>&1
while [ -z "${STORAGE:+x}" ]; do
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "EFI Disk Storage" --radiolist \
"$(translate "Choose the storage volume for the EFI disk (4MB):\n\nUse Spacebar to select.")" \
"$(translate "Choose the storage for the EFI disk (4MB):")"$'\n\n'"$(translate "Use Spacebar to select.")" \
16 $(($MSG_MAX_LENGTH + 23)) 6 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || {
msg_warn "$(translate "EFI storage selection cancelled.")" >&2
@@ -1004,8 +1004,8 @@ function select_storage_volume() {
STORAGE=${STORAGE_MENU[0]}
else
while [ -z "${STORAGE:+x}" ]; do
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "Storage Pools" --radiolist \
"$(translate "Choose the storage volume for $purpose:\n\nUse Spacebar to select.")" \
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage")" --radiolist \
"$(translate "Choose the storage for the loader disk:")"$'\n\n'"$(translate "Use Spacebar to select.")" \
16 $(($MSG_MAX_LENGTH + 23)) 6 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || {
msg_warn "$(translate "Storage selection cancelled for $purpose.")" >&2
scripts/vm/vm_creator.sh
+7 -1
View File
@@ -179,8 +179,14 @@ function select_storage_target() {
STORAGE="${STORAGE_MENU[0]}"
else
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" >/dev/null 2>&1
local storage_prompt
case "$PURPOSE" in
EFI) storage_prompt=$(translate "Choose the storage for the EFI disk (4MB):") ;;
TPM) storage_prompt=$(translate "Choose the storage for the TPM disk (4MB):") ;;
*) storage_prompt=$(translate "Choose the storage volume for the $PURPOSE disk (4MB):") ;;
esac
STORAGE=$(whiptail --backtitle "ProxMenux" --title "$(translate "$PURPOSE Disk Storage")" --radiolist \
"$(translate "Choose the storage volume for the $PURPOSE disk (4MB):\n\nUse Spacebar to select.")" 16 70 6 \
"$storage_prompt"$'\n\n'"$(translate "Use Spacebar to select.")" 16 70 6 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || {
msg_warn "$(translate "$PURPOSE disk storage selection cancelled.")" >&2
return 1
scripts/vm/zimaos.sh
+6 -6
View File
@@ -555,7 +555,7 @@ function select_disk_type() {
}
function select_virtual_disk() {
msg_info "Detecting available storage volumes..."
msg_info "$(translate "Detecting storage for disk images...")"
local STORAGE_MENU=()
local TAG TYPE FREE ITEM
@@ -579,8 +579,8 @@ function select_virtual_disk() {
STORAGE=${STORAGE_MENU[0]}
else
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" >/dev/null 2>&1
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage Volume")" --radiolist \
"$(translate "Choose the storage volume for the virtual disk:\n")" 20 78 10 \
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage")" --radiolist \
"$(translate "Choose the storage for the virtual disk:")"$'\n' 20 78 10 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || return 0
[[ -z "$STORAGE" ]] && return 0
fi
@@ -990,7 +990,7 @@ function select_efi_storage() {
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" > /dev/null 2>&1
while [ -z "${STORAGE:+x}" ]; do
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "EFI Disk Storage" --radiolist \
"$(translate "Choose the storage volume for the EFI disk (4MB):\n\nUse Spacebar to select.")" \
"$(translate "Choose the storage for the EFI disk (4MB):")"$'\n\n'"$(translate "Use Spacebar to select.")" \
16 $(($MSG_MAX_LENGTH + 23)) 6 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || {
msg_warn "$(translate "EFI storage selection cancelled.")" >&2
@@ -1041,8 +1041,8 @@ function select_storage_volume() {
STORAGE=${STORAGE_MENU[0]}
else
while [ -z "${STORAGE:+x}" ]; do
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "Storage Pools" --radiolist \
"$(translate "Choose the storage volume for $purpose:")" \
STORAGE=$(whiptail --backtitle "ProxMenuX" --title "$(translate "Select Storage")" --radiolist \
"$(translate "Choose the storage for the loader disk:")" \
16 $(($MSG_MAX_LENGTH + 23)) 6 \
"${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || {
msg_warn "$(translate "Storage selection cancelled for $purpose.")" >&2