Dear all,

In case no mirror was previously configured (aka, this is a fresh
install) and ftplist1.openbsd.org is unreachable, perhaps it's useful to
suggest a default mirror to expedite the installation process.

Terminal transcript on a machine that's not able to reach ftplist1,
doing 'enter enter enter enter':

        Let's install the sets!
        Location of sets? (disk http nfs or 'done') [http]
        HTTP proxy URL? (e.g. 'http://proxy:8080', or 'none') [none]
        (Unable to get list from openbsd.org, but that is OK)
        HTTP Server? (hostname or 'done') [cdn.openbsd.org]
        Server directory? [pub/OpenBSD/snapshots/amd64]

The below diff is joint work with kn@

OK?

Kind regards,

Job

Index: distrib/miniroot/install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
diff -u -p -r1.1257 install.sub
--- distrib/miniroot/install.sub        24 Oct 2023 18:03:53 -0000      1.1257
+++ distrib/miniroot/install.sub        25 Oct 2023 13:42:28 -0000
@@ -1868,6 +1868,7 @@ install_http() {
        else
                echo "(Unable to get list from openbsd.org, but that is OK)"
                _prompt="HTTP Server? (hostname or 'done')"
+               HTTP_SERVER=$DEFAULT_MIRROR
        fi
 
        # Use information from /etc/installurl as defaults for upgrades.
@@ -2935,7 +2936,7 @@ finish_up() {
 
        # Create /etc/installurl if it does not yet exist.
        if [[ ! -f /mnt/etc/installurl ]]; then
-               echo "${INSTALL_URL:-https://cdn.openbsd.org/pub/OpenBSD}"; \
+               echo "${INSTALL_URL:-https://${DEFAULT_MIRROR}/pub/OpenBSD}"; \
                        >/mnt/etc/installurl
        fi
 
@@ -3621,6 +3622,7 @@ UPGRADE_BSDRD=false
 V4_AUTOCONF=false
 V6_AUTOCONF=false
 WLANLIST=/tmp/i/wlanlist
+DEFAULT_MIRROR=cdn.openbsd.org
 
 # Save one boot's worth of dmesg.
 dmesgtail >/var/run/dmesg.boot

Reply via email to