diff --git a/AppImage/components/login.tsx b/AppImage/components/login.tsx
index 0e48443b..04331e1c 100644
--- a/AppImage/components/login.tsx
+++ b/AppImage/components/login.tsx
@@ -271,7 +271,7 @@ export function Login({ onLogin }: LoginProps) {
- ProxMenux Monitor v1.2.2.1-beta
+ ProxMenux Monitor v1.2.2.2-beta
)
diff --git a/AppImage/components/proxmox-dashboard.tsx b/AppImage/components/proxmox-dashboard.tsx
index 94186975..1cbffee5 100644
--- a/AppImage/components/proxmox-dashboard.tsx
+++ b/AppImage/components/proxmox-dashboard.tsx
@@ -836,7 +836,7 @@ export function ProxmoxDashboard() {
diff --git a/scripts/backup_restore/backup_host.sh b/scripts/backup_restore/backup_host.sh
index 81685ef5..8a7d524c 100644
--- a/scripts/backup_restore/backup_host.sh
+++ b/scripts/backup_restore/backup_host.sh
@@ -273,7 +273,7 @@ _bk_local() {
hb_require_cmd rsync rsync || return 1
- dest_dir=$(hb_prompt_dest_dir) || return 1
+ dest_dir=$(hb_select_local_target) || return 1
hb_select_profile_paths "$profile_mode" paths || return 1
# Safety check: if the destination directory is INSIDE any selected
@@ -416,53 +416,127 @@ _bk_scheduler() {
_bk_manage_local_destinations() {
while true; do
- # Snapshot all currently mounted USB backup partitions with size info
- local -a usb_mp=()
- local -a usb_desc=()
- local state path_or_dev label size fstype uuid
- while IFS=$'\t' read -r state path_or_dev label size fstype uuid; do
- [[ "$state" != "mounted" ]] && continue
- local dfline
- dfline=$(df -h "$path_or_dev" 2>/dev/null | tail -1)
- local used="?" avail="?" pct="?"
- if [[ -n "$dfline" ]]; then
- used=$(awk '{print $3}' <<<"$dfline")
- avail=$(awk '{print $4}' <<<"$dfline")
- pct=$(awk '{print $5}' <<<"$dfline")
- fi
- usb_mp+=("$path_or_dev")
- usb_desc+=("${label:-?} [${fstype}] $size → $path_or_dev ($used $(translate "used"), $avail $(translate "free"), $pct)")
- done < <(hb_list_usb_partitions)
+ # Single configured target (or none → caller falls back to default)
+ local current=""
+ current=$(hb_get_local_target 2>/dev/null) || current=""
local body=""
- if (( ${#usb_desc[@]} == 0 )); then
- body+="$(translate "No USB drives are currently mounted by ProxMenux.")"
+ if [[ -n "$current" ]]; then
+ body+="\Zb$(translate "Currently configured target:")\ZB"$'\n'
+ body+=" \Z4${current}\Zn"
else
- body+="\Zb$(translate "Mounted USB drives:")\ZB"$'\n'
- local d
- for d in "${usb_desc[@]}"; do
- body+=" • ${d}"$'\n'
- done
+ body+="$(translate "No target configured.")"$'\n'
+ body+="$(translate "Default will be used:") \Z4${HB_LOCAL_TARGET_DEFAULT}\Zn"
fi
- body+=$'\n'"$(translate "Local destinations are file paths — they are NOT registered as Proxmox storage.")"
local -a menu_args=()
- menu_args+=("mount" "+ $(translate "Mount a USB drive now")")
- if (( ${#usb_mp[@]} > 0 )); then
- menu_args+=("unmount" "− $(translate "Unmount a USB drive")")
+ menu_args+=("default" "1 $(translate "Use default") (${HB_LOCAL_TARGET_DEFAULT})")
+ menu_args+=("custom" "2 $(translate "Use a custom path")")
+ menu_args+=("usb" "3 $(translate "Use a USB disk")")
+ if [[ -n "$current" ]]; then
+ menu_args+=("clear" "C $(translate "Clear configured target")")
fi
menu_args+=("back" "$(translate "← Return")")
local choice
choice=$(dialog --backtitle "ProxMenux" --colors \
- --title "$(translate "Local archive destinations")" \
+ --title "$(translate "Manage local backup target")" \
--menu "\n${body}\n" \
"$HB_UI_MENU_H" "$HB_UI_MENU_W" "$HB_UI_MENU_LIST" "${menu_args[@]}" \
3>&1 1>&2 2>&3) || break
case "$choice" in
+ default)
+ hb_set_local_target "$HB_LOCAL_TARGET_DEFAULT"
+ ;;
+ custom)
+ local new_path
+ new_path=$(dialog --backtitle "ProxMenux" \
+ --title "$(translate "Custom path")" \
+ --inputbox "$(translate "Absolute directory path to use as backup target:")" \
+ "$HB_UI_INPUT_H" "$HB_UI_INPUT_W" "/backup" \
+ 3>&1 1>&2 2>&3) || continue
+ new_path=$(hb_trim_dialog_value "$new_path")
+ [[ -z "$new_path" ]] && continue
+ mkdir -p "$new_path" 2>/dev/null || {
+ dialog --backtitle "ProxMenux" --msgbox \
+ "$(translate "Cannot create:") $new_path" 8 60
+ continue
+ }
+ hb_set_local_target "$new_path"
+ ;;
+ usb)
+ _bk_local_target_usb_submenu
+ ;;
+ clear)
+ hb_clear_local_target
+ ;;
+ back) break ;;
+ esac
+ done
+}
+
+# Submenu reached when the user picks "Use a USB disk" in the local
+# target manager. Lists mounted USB partitions so the operator can pick
+# one as the target; mount / unmount are auxiliary actions for preparing
+# a fresh disk or releasing one. Picking a USB sets it as the configured
+# target and returns to the parent menu.
+_bk_local_target_usb_submenu() {
+ while true; do
+ local -a usb_mp=()
+ local -a usb_desc=()
+ local state path_or_dev label size fstype uuid
+ while IFS=$'\t' read -r state path_or_dev label size fstype uuid; do
+ [[ "$state" != "mounted" ]] && continue
+ usb_mp+=("$path_or_dev")
+ usb_desc+=("${label:-?} [${fstype}] $size → $path_or_dev")
+ done < <(hb_list_usb_partitions)
+
+ local body=""
+ if (( ${#usb_mp[@]} > 0 )); then
+ body+="\Zb$(translate "USB drives mounted now:")\ZB"$'\n'
+ local d
+ for d in "${usb_desc[@]}"; do
+ body+=" • ${d}"$'\n'
+ done
+ else
+ body+="$(translate "No USB drives mounted by ProxMenux yet. Mount one first to use it as a target.")"
+ fi
+
+ local -a menu_args=()
+ if (( ${#usb_mp[@]} > 0 )); then
+ menu_args+=("pick" "$(translate "Pick a mounted USB as target")")
+ fi
+ menu_args+=("mount" "⊕ $(translate "Mount a USB drive now")")
+ if (( ${#usb_mp[@]} > 0 )); then
+ menu_args+=("unmount" "⊖ $(translate "Unmount a USB drive")")
+ fi
+ menu_args+=("back" "$(translate "← Return")")
+
+ local choice
+ choice=$(dialog --backtitle "ProxMenux" --colors \
+ --title "$(translate "USB disk target")" \
+ --menu "\n${body}\n" \
+ "$HB_UI_MENU_H" "$HB_UI_MENU_W" "$HB_UI_MENU_LIST" "${menu_args[@]}" \
+ 3>&1 1>&2 2>&3) || break
+
+ case "$choice" in
+ pick)
+ local pick_menu=() i=1 idx
+ for idx in "${!usb_mp[@]}"; do
+ pick_menu+=("$i" "${usb_desc[$idx]}"); ((i++))
+ done
+ local pick
+ pick=$(dialog --backtitle "ProxMenux" \
+ --title "$(translate "Pick USB target")" \
+ --menu "\n$(translate "Select the mounted USB to use as backup target:")" \
+ "$HB_UI_MENU_H" "$HB_UI_MENU_W" "$HB_UI_MENU_LIST" "${pick_menu[@]}" \
+ 3>&1 1>&2 2>&3) || continue
+ hb_set_local_target "${usb_mp[$((pick-1))]}"
+ return 0
+ ;;
mount)
- # Reuse the runtime USB picker; result is discarded.
+ # Auxiliary: prepare a USB so it can be picked next pass.
hb_prompt_mounted_path "/mnt/backup" >/dev/null || true
;;
unmount)
@@ -506,7 +580,7 @@ _bk_manage_destinations() {
"$HB_UI_MENU_H" "$HB_UI_MENU_W" "$HB_UI_MENU_LIST" \
1 "$(translate "Proxmox Backup Server (PBS) destinations")" \
2 "$(translate "Borg repositories")" \
- 3 "$(translate "Local archive destinations (mounted USBs, mount, unmount)")" \
+ 3 "$(translate "Local archive targets (paths + USB mount/unmount)")" \
0 "$(translate "Return")" \
3>&1 1>&2 2>&3) || break
diff --git a/scripts/backup_restore/backup_scheduler.sh b/scripts/backup_restore/backup_scheduler.sh
index f19b9cf2..c4c5ceb4 100644
--- a/scripts/backup_restore/backup_scheduler.sh
+++ b/scripts/backup_restore/backup_scheduler.sh
@@ -375,7 +375,7 @@ _create_job() {
case "$backend" in
local)
local dest_dir ext
- dest_dir=$(hb_prompt_dest_dir) || return 1
+ dest_dir=$(hb_select_local_target) || return 1
ext=$(dialog --backtitle "ProxMenux" --title "$(translate "Archive format")" \
--menu "\n$(translate "Select local archive format:")" 12 62 4 \
"tar.zst" "tar + zstd (preferred)" \
diff --git a/scripts/backup_restore/lib_host_backup_common.sh b/scripts/backup_restore/lib_host_backup_common.sh
index d5b9010e..685d429b 100644
--- a/scripts/backup_restore/lib_host_backup_common.sh
+++ b/scripts/backup_restore/lib_host_backup_common.sh
@@ -1998,7 +1998,63 @@ hb_format_usb_disk() {
printf '%s' "$mp"
}
+# ── Local backup target: single configured value (no list) ──
+#
+# Only ONE local target is active at a time. Persisted as a single line in
+# $HB_STATE_DIR/local-target.conf. If the file is absent, callers default
+# to HB_LOCAL_TARGET_DEFAULT (/var/lib/vz/dump).
+
+HB_LOCAL_TARGET_DEFAULT="/var/lib/vz/dump"
+
+# Echoes the configured target path. Returns 1 if none configured (caller
+# may default to HB_LOCAL_TARGET_DEFAULT).
+hb_get_local_target() {
+ local cfg="$HB_STATE_DIR/local-target.conf"
+ [[ -f "$cfg" ]] || return 1
+ local path
+ path=$(head -1 "$cfg" 2>/dev/null | tr -d '\r\n')
+ [[ -z "$path" ]] && return 1
+ echo "$path"
+ return 0
+}
+
+hb_set_local_target() {
+ local path="$1"
+ [[ -z "$path" ]] && return 1
+ path="${path%/}"
+ mkdir -p "$HB_STATE_DIR"
+ local cfg="$HB_STATE_DIR/local-target.conf"
+ printf '%s\n' "$path" > "$cfg"
+ chmod 600 "$cfg"
+ return 0
+}
+
+hb_clear_local_target() {
+ rm -f "$HB_STATE_DIR/local-target.conf"
+}
+
+# Always returns a usable path. If nothing is configured, falls back to
+# the default. Callers do NOT prompt — the user pre-configures the target
+# in "Manage local backup target".
+hb_select_local_target() {
+ local path
+ if path=$(hb_get_local_target); then
+ echo "$path"
+ else
+ echo "$HB_LOCAL_TARGET_DEFAULT"
+ fi
+ return 0
+}
+
hb_prompt_mounted_path() {
+ # `dialog --yesno` / `dialog --msgbox` write their TUI to stdout by
+ # convention. When this function is called as `mnt=$(hb_prompt_mounted_path)`
+ # the subshell captures every TUI escape into $mnt and corrupts the
+ # caller (saw it as garbage in borg-targets.txt). Stash real stdout in
+ # fd 9, redirect stdout to the TTY for the body, and emit the actual
+ # return value through fd 9.
+ exec 9>&1 >/dev/tty
+
local default_path="${1:-/mnt/backup}"
local -a menu=()
@@ -2038,7 +2094,7 @@ hb_prompt_mounted_path() {
--yesno "$(hb_translate "This path is not a registered mount point. Use it anyway?")" \
"$HB_UI_YESNO_H" "$HB_UI_YESNO_W" || return 1
fi
- echo "$out"
+ echo "$out" >&9
return 0
fi
@@ -2054,7 +2110,7 @@ hb_prompt_mounted_path() {
case "$s_state" in
mounted)
- echo "$s_path"
+ echo "$s_path" >&9
return 0
;;
@@ -2078,7 +2134,7 @@ hb_prompt_mounted_path() {
# The wizard prints the destination path right after, so go
# straight to the backup flow instead of asking for an extra
# confirmation click on a "mounted OK" dialog.
- echo "$mounted_at"
+ echo "$mounted_at" >&9
return 0
;;
@@ -2116,7 +2172,7 @@ hb_prompt_mounted_path() {
dialog --backtitle "ProxMenux" --colors \
--title "$(hb_translate "Formatted and mounted")" \
--msgbox "\Zb$(hb_translate "Mounted at")\ZB \Z4${mounted_at}\Zn" 8 70
- echo "$mounted_at"
+ echo "$mounted_at" >&9
return 0
;;
esac