From 098afdb9dc845e39ec6978f3278d8f7474bf3279 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:05:29 +0200 Subject: [PATCH] Update tools.func --- misc/tools.func | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/misc/tools.func b/misc/tools.func index 3b874acc..dd8a28b7 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -2308,23 +2308,25 @@ function setup_mysql() { # Cleanup old repository files cleanup_old_repo_files "mysql" - # MySQL compatibility check for Debian Trixie - use Bookworm packages - local SUITE + # MySQL compatibility check for Debian Trixie if [[ "$DISTRO_ID" == "debian" && "$DISTRO_CODENAME" =~ ^(trixie|forky|sid)$ ]]; then - msg_warn "MySQL not officially supported on Debian testing/unstable - using Bookworm packages" - SUITE="bookworm" - else - case "$DISTRO_CODENAME" in - bookworm | bullseye) - SUITE="$DISTRO_CODENAME" - ;; - *) - # For Ubuntu - SUITE=$(get_fallback_suite "$DISTRO_ID" "$DISTRO_CODENAME" "https://repo.mysql.com/apt/${DISTRO_ID}") - ;; - esac + msg_error "MySQL is not compatible with Debian ${DISTRO_CODENAME}" + msg_info "Use MariaDB instead: MARIADB_VERSION=\"11.4\" setup_mariadb" + return 1 fi + # Determine suite + local SUITE + case "$DISTRO_CODENAME" in + bookworm | bullseye) + SUITE="$DISTRO_CODENAME" + ;; + *) + # For Ubuntu + SUITE=$(get_fallback_suite "$DISTRO_ID" "$DISTRO_CODENAME" "https://repo.mysql.com/apt/${DISTRO_ID}") + ;; + esac + # Stop existing MySQL if running $STD systemctl stop mysql 2>/dev/null || true