From: Andrew Hewus Fresh <andrew@afresh1.com>
Subject: Re: install.sub: Fix mirror list on floppies
To: David Leadbeater <dgl@dgl.cx>
Cc: tech@openbsd.org
Date: Fri, 18 Sep 2026 15:10:05 -0700

On Sat, Sep 19, 2026 at 07:34:39AM +1000, David Leadbeater wrote:
> On install images without timezone data, the set_timezone function
> returned before wait_cgiinfo was called. This meant the list of mirrors
> was downloaded, but never presented to the user.
> 
> Call wait_cgiinfo in do_install directly (this more closely matches how
> do_upgrade does it).

This makes sense to me.



> Tests welcome, I've tested amd64/ramdiskA, affects:
> $ grep -L '^TZ' */*/list
> amd64/ramdiskA/list
> i386/ramdisk/list
> sparc64/ramdiskB/list
> 
> 
> Index: install.sub
> ===================================================================
> RCS file: /cvs/src/distrib/miniroot/install.sub,v
> diff -u -p -r1.1289 install.sub
> --- install.sub	5 Sep 2026 11:28:38 -0000	1.1289
> +++ install.sub	18 Sep 2026 20:44:50 -0000
> @@ -2366,7 +2366,6 @@ set_timezone() {
>  		TZ=${TZ#*${_zoneroot#/mnt}/}
>  	fi
>  
> -	wait_cgiinfo
>  	isin "$CGI_TZ" $(<$_zonefile) && TZ=$CGI_TZ
>  
>  	# If neither the base or HTTP_LIST gave a hint, and this is the
> @@ -3214,6 +3213,9 @@ do_install() {
>  	# Gather information for setting up the initial user account.
>  	user_setup
>  	ask_root_sshd
> +
> +	# Ensure that previous installer choices (e.g. timezone) are available.
> +	wait_cgiinfo
>  
>  	# Set TZ variable based on zonefile and user selection.
>  	set_timezone /var/tzlist
> 

-- 
andrew

I'm impatient with stupidity.
                      -- Klaatu