From 9db2169ee015407bc33dbac8809f2b06854d1de7 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:46:27 +0100 Subject: [PATCH] Improve apt mirror scanning and retry logic Make APT mirror selection more robust by scanning for reachable mirrors and retrying installs with clearer failure reasons. In misc/build.func added mirror_exit, try_mirrors and scan_reachable helpers; prefer regional mirrors (pick up to 3), fall back to ftp.debian.org, then try global mirrors. Improved detection/reporting of hash mismatches vs apt-get errors and return codes, and use a short reachability TCP check before attempting updates. In misc/install.func added a reachable-mirror scan phase, count/report reachable mirrors, and provide clearer log messages when apt-get update/install fails. These changes aim to reduce failures caused by unreachable mirrors or CDN synchronization issues. --- misc/build.func | 75 ++++++++++++++++++++----- misc/install.func | 140 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 157 insertions(+), 58 deletions(-) diff --git a/misc/build.func b/misc/build.func index 3d3ba3a6..bde18e63 100644 --- a/misc/build.func +++ b/misc/build.func @@ -4602,6 +4602,7 @@ EOF' pct exec "$CTID" -- bash -c "apt-get update >/dev/null 2>&1 && apt-get install -y sudo curl mc gnupg2 jq >/dev/null 2>&1" || { msg_warn "apt-get update failed, trying alternate mirrors..." + local mirror_exit=0 pct exec "$CTID" -- bash -c ' APT_BASE="sudo curl mc gnupg2 jq" EU_MIRRORS="ftp.de.debian.org ftp.fr.debian.org ftp.nl.debian.org ftp.uk.debian.org ftp.ch.debian.org ftp.se.debian.org ftp.it.debian.org ftp.fau.de ftp.halifax.rwth-aachen.de debian.mirror.lrz.de mirror.init7.net debian.ethz.ch mirrors.dotsrc.org debian.mirrors.ovh.net" @@ -4615,33 +4616,77 @@ EOF' Asia/*|Australia/*|Pacific/*) REGIONAL="$AP_MIRRORS"; OTHERS="$EU_MIRRORS $US_MIRRORS" ;; *) REGIONAL=""; OTHERS="$EU_MIRRORS $US_MIRRORS $AP_MIRRORS" ;; esac - MIRRORS="$(printf "%s\n" $REGIONAL | shuf) ftp.debian.org $(printf "%s\n" $OTHERS | shuf)" echo "Acquire::By-Hash \"no\";" >/etc/apt/apt.conf.d/99no-by-hash - FAIL_COUNT=0 - for mirror in $MIRRORS; do - timeout 2 bash -c "echo >/dev/tcp/$mirror/80" 2>/dev/null || { echo " [skip] $mirror (unreachable)"; continue; } - echo " [try] $mirror ..." + + try_mirrors() { for src in /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list; do - [ -f "$src" ] && sed -i "s|URIs: http[s]*://[^/]*/|URIs: https://${mirror}/|g; s|deb http[s]*://[^/]*/|deb https://${mirror}/|g" "$src" + [ -f "$src" ] && sed -i "s|URIs: http[s]*://[^/]*/|URIs: https://${1}/|g; s|deb http[s]*://[^/]*/|deb https://${1}/|g" "$src" done rm -rf /var/lib/apt/lists/* APT_OUT=$(apt-get update 2>&1) + APT_RC=$? if echo "$APT_OUT" | grep -qi "hashsum\|hash sum"; then - echo " [fail] $mirror (hash mismatch)" + echo " [fail] $1 (hash mismatch)" echo "$APT_OUT" | grep -i "hash" | head -3 | sed "s/^/ /" + return 1 + elif [ $APT_RC -ne 0 ]; then + echo " [fail] $1 (apt-get update error)" + echo "$APT_OUT" | grep "^E:" | head -3 | sed "s/^/ /" + return 1 elif apt-get install -y $APT_BASE >/dev/null 2>&1; then - echo " [ok] $mirror" - exit 0 + echo " [ok] $1" + return 0 else - echo " [fail] $mirror" + echo " [fail] $1 (package install error)" + return 1 fi - FAIL_COUNT=$((FAIL_COUNT + 1)) - [ "$FAIL_COUNT" -ge 3 ] && exit 2 + } + + scan_reachable() { + local result="" + for m in $1; do + if timeout 2 bash -c "echo >/dev/tcp/$m/80" 2>/dev/null; then + result="$result $m" + else + echo " [skip] $m (unreachable)" + fi + done + echo "$result" | xargs + } + + # Phase 1: Scan regional mirrors, pick 3 random, try them + echo " [scan] Checking regional mirrors..." + REGIONAL_OK=$(scan_reachable "$REGIONAL") + REGIONAL_PICK=$(printf "%s\n" $REGIONAL_OK | shuf | head -3 | xargs) + R_COUNT=$(echo $REGIONAL_PICK | wc -w) + echo " [scan] $R_COUNT regional mirrors reachable (of $(echo $REGIONAL | wc -w))" + + for mirror in $REGIONAL_PICK; do + echo " [try] $mirror ..." + try_mirrors "$mirror" && exit 0 done - exit 1 - ' - mirror_exit=$? + + # Phase 2: Try ftp.debian.org + if timeout 2 bash -c "echo >/dev/tcp/ftp.debian.org/80" 2>/dev/null; then + echo " [try] ftp.debian.org ..." + try_mirrors "ftp.debian.org" && exit 0 + fi + + # Phase 3: Scan rest-of-world mirrors, pick 3 random, try them + echo " [scan] Checking global mirrors..." + OTHERS_OK=$(scan_reachable "$OTHERS") + OTHERS_PICK=$(printf "%s\n" $OTHERS_OK | shuf | head -3 | xargs) + O_COUNT=$(echo $OTHERS_PICK | wc -w) + echo " [scan] $O_COUNT global mirrors reachable (of $(echo $OTHERS | wc -w))" + + for mirror in $OTHERS_PICK; do + echo " [try] $mirror ..." + try_mirrors "$mirror" && exit 0 + done + + exit 2 + ' && mirror_exit=0 || mirror_exit=$? if [[ $mirror_exit -eq 2 ]]; then msg_warn "Multiple mirrors failed (possible CDN synchronization issue)." msg_info "Find Debian mirrors at: https://www.debian.org/mirror/list" diff --git a/misc/install.func b/misc/install.func index bfb149ec..6656b664 100644 --- a/misc/install.func +++ b/misc/install.func @@ -226,59 +226,113 @@ pkg_update() { others="$eu_mirrors $us_mirrors $ap_mirrors" ;; esac - local mirrors - mirrors="$(printf '%s\n' $regional | shuf) ftp.debian.org $(printf '%s\n' $others | shuf)" echo 'Acquire::By-Hash "no";' >/etc/apt/apt.conf.d/99no-by-hash - local apt_ok=false - local fail_count=0 - for mirror in $mirrors; do - timeout 2 bash -c "echo >/dev/tcp/$mirror/80" 2>/dev/null || { - msg_info "Mirror skip: ${mirror} (unreachable)" - continue - } - msg_info "Trying mirror: ${mirror}" + + _try_apt_mirror() { + local m=$1 for src in /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list; do - [[ -f "$src" ]] && sed -i "s|URIs: http[s]*://[^/]*/|URIs: https://${mirror}/|g; s|deb http[s]*://[^/]*/|deb https://${mirror}/|g" "$src" + [[ -f "$src" ]] && sed -i "s|URIs: http[s]*://[^/]*/|URIs: https://${m}/|g; s|deb http[s]*://[^/]*/|deb https://${m}/|g" "$src" done rm -rf /var/lib/apt/lists/* - local apt_out - apt_out=$(apt-get update 2>&1) - if echo "$apt_out" | grep -qi "hashsum\|hash sum"; then - msg_warn "Mirror failed: ${mirror} (hash mismatch)" - echo "$apt_out" | grep -i "hash" | head -3 | sed 's/^/ /' - elif echo "$apt_out" | grep -q "^E:"; then - msg_warn "Mirror failed: ${mirror}" + local out + out=$(apt-get update 2>&1) + if echo "$out" | grep -qi "hashsum\|hash sum"; then + msg_warn "Mirror failed: ${m} (hash mismatch)" + echo "$out" | grep -i "hash" | head -3 | sed 's/^/ /' + return 1 + elif echo "$out" | grep -q "^E:"; then + msg_warn "Mirror failed: ${m} (apt-get update error)" + echo "$out" | grep "^E:" | head -3 | sed 's/^/ /' + return 1 else - msg_ok "Using mirror: ${mirror}" + msg_ok "Using mirror: ${m}" + return 0 + fi + } + + _scan_reachable() { + local result="" + for m in $1; do + if timeout 2 bash -c "echo >/dev/tcp/$m/80" 2>/dev/null; then + result="$result $m" + else + msg_info "Mirror skip: ${m} (unreachable)" + fi + done + echo "$result" | xargs + } + + local apt_ok=false + + # Phase 1: Scan regional mirrors, pick 3 random, try them + msg_info "Scanning regional mirrors..." + local regional_ok + regional_ok=$(_scan_reachable "$regional") + local regional_pick + regional_pick=$(printf '%s\n' $regional_ok | shuf | head -3 | xargs) + local r_count + r_count=$(echo "$regional_pick" | wc -w) + msg_info "Found ${r_count} regional mirrors to try" + + for mirror in $regional_pick; do + msg_info "Trying mirror: ${mirror}" + if _try_apt_mirror "$mirror"; then apt_ok=true break fi - fail_count=$((fail_count + 1)) - if [[ $fail_count -ge 3 ]]; then - msg_warn "Multiple mirrors failed (possible CDN synchronization issue)." - msg_info "Find Debian mirrors at: https://www.debian.org/mirror/list" - while true; do - read -rp " Enter a Debian mirror hostname (or 'skip' to abort): " custom_mirror /dev/tcp/ftp.debian.org/80" 2>/dev/null; then + msg_info "Trying mirror: ftp.debian.org" + if _try_apt_mirror "ftp.debian.org"; then + apt_ok=true + fi + fi + fi + + # Phase 3: Scan rest-of-world mirrors, pick 3 random, try them + if [[ "$apt_ok" != true ]]; then + msg_info "Scanning global mirrors..." + local others_ok + others_ok=$(_scan_reachable "$others") + local others_pick + others_pick=$(printf '%s\n' $others_ok | shuf | head -3 | xargs) + local o_count + o_count=$(echo "$others_pick" | wc -w) + msg_info "Found ${o_count} global mirrors to try" + + for mirror in $others_pick; do + msg_info "Trying mirror: ${mirror}" + if _try_apt_mirror "$mirror"; then + apt_ok=true + break + fi + done + fi + + # Phase 4: All auto mirrors failed, prompt user + if [[ "$apt_ok" != true ]]; then + msg_warn "Multiple mirrors failed (possible CDN synchronization issue)." + msg_info "Find Debian mirrors at: https://www.debian.org/mirror/list" + while true; do + read -rp " Enter a Debian mirror hostname (or 'skip' to abort): " custom_mirror