From f979dd22777bf304e8c36d0362f913afe0bf7017 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Fri, 12 Sep 2025 21:28:28 +0200
Subject: [PATCH] [core]: add fallback if mariadb upstream unreachable (#7599)

---
 misc/tools.func | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/misc/tools.func b/misc/tools.func
index d254fec19..1a7b76d60 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -1202,7 +1202,19 @@ setup_mariadb() {
       echo "mariadb-server-$ver mariadb-server/feedback boolean false" | debconf-set-selections
     done
   fi
-  DEBIAN_FRONTEND=noninteractive $STD apt-get install -y mariadb-server mariadb-client
+  DEBIAN_FRONTEND=noninteractive $STD apt-get install -y mariadb-server mariadb-client || {
+    msg_warn "Failed to install MariaDB ${MARIADB_VERSION} from upstream repo – trying distro package as fallback..."
+    # Cleanup, remove upstream repo to avoid conflicts
+    rm -f /etc/apt/sources.list.d/mariadb.list /etc/apt/trusted.gpg.d/mariadb.gpg
+    $STD apt-get update
+    # Final fallback: distro package
+    DEBIAN_FRONTEND=noninteractive $STD apt-get install -y mariadb-server mariadb-client || {
+      msg_error "MariaDB installation failed even with distro fallback!"
+      return 1
+    }
+    msg_ok "Setup MariaDB (distro fallback)"
+    return 0
+  }
 
   msg_ok "Setup MariaDB $MARIADB_VERSION"
 }