From a0cca159600481df40a30deb645df5de09955d3f Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Thu, 23 Apr 2026 15:30:07 +0200 Subject: [PATCH] Revert "Prefer silent mode on PHS env conflict (#13951)" This reverts commit a37b36520c5e208068aa4be39495bb9e04b0e615. --- misc/build.func | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/misc/build.func b/misc/build.func index 127e8a641..d1588eb89 100644 --- a/misc/build.func +++ b/misc/build.func @@ -3520,14 +3520,10 @@ msg_menu() { # ------------------------------------------------------------------------------ resolve_phs_mode() { if [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]] && [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then - # Conflict handling must never block unattended/non-TTY updates. - # Prefer silent mode to keep automation safe. - if [[ -t 0 ]] && [[ -t 1 ]] && command -v whiptail >/dev/null 2>&1; then - whiptail --backtitle "Proxmox VE Helper Scripts" \ - --title "Configuration Conflict Warning" \ - --msgbox "PHS_SILENT and PHS_VERBOSE are both set.\n\nFalling back to silent mode." 10 58 || true - fi - PHS_MODE="silent" + whiptail --backtitle "Proxmox VE Helper Scripts" \ + --title "⚠️ Configuration Conflict Warning" \ + --msgbox "PHS_SILENT and PHS_VERBOSE environment variables are both set.\n\nFalling back to interactive mode." 10 58 + PHS_MODE="interactive" elif [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]]; then PHS_MODE="silent" elif [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then