From 04038c19d3024b19540ac2b864f4190052801f3a Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Thu, 9 Apr 2026 12:06:19 +0800 Subject: [PATCH] installer: Add download.freebsd.org to mirror list download.freebsd.org is backed by project mirrors and a CDN, which should benefit most users. Sponsored by: The FreeBSD Foundation Reviewed by: delphij (releng) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54849 (cherry picked from commit 45079cdf8b517adf803db7dc7aa85e5728cfeb2f) --- usr.sbin/bsdinstall/scripts/mirrorselect | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 1ffbf1512ee..fa6ef41330f 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -40,6 +40,7 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ 0 0 16 \ + http://download.freebsd.org "Main Site (GeoDNS, CDN, HTTP)"\ http://ftp.freebsd.org "Main Site (GeoDNS, HTTP)"\ ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ @@ -105,7 +106,17 @@ case ${_UNAME_R} in ;; esac -BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" +case ${MIRROR} in + *ftp*) + BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD" + ;; + *) + BSDINSTALL_DISTSITE="$MIRROR" + ;; + +esac + +BSDINSTALL_DISTSITE="${BSDINSTALL_DISTSITE}/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" case $MIRROR_BUTTON in $BSDDIALOG_ERROR | $BSDDIALOG_CANCEL | $BSDDIALOG_ESC)