From: Andrew Hewus Fresh <andrew@afresh1.com>
Subject: Re: installer: sets: do not offer http/nfs without network
To: Klemens Nanni <kn@openbsd.org>
Cc: OpenBSD tech <tech@openbsd.org>
Date: Fri, 2 May 2025 19:30:47 -0700

On Thu, May 01, 2025 at 06:48:09PM +0000, Klemens Nanni wrote:
[...]
>     This diff reads much better with `sdiff -w165 old new' than in unified form.

Thanks, one question first.


> 
> Feedback? OK?
> 
> Index: install.sub
> ===================================================================
> RCS file: /cvs/src/distrib/miniroot/install.sub,v
> diff -u -p -r1.1269 install.sub
> --- install.sub	6 Apr 2025 11:54:36 -0000	1.1269
> +++ install.sub	1 May 2025 18:12:45 -0000
> @@ -2796,27 +2796,30 @@ feed_random() {
>  # selects from that location. Repeat as many times as the user needs to get all
>  # desired sets.
>  install_sets() {
> -	local _cddevs=$(get_cddevs) _d _im _locs="disk http" _src
> +	# Default to method recorded last time, if any.
> +	local _cddevs=$(get_cddevs) _d=$CGI_METHOD _im _locs=disk _src
>  
> -	echo
> +	[[ -n $_cddevs ]] && : ${_d:=cd0}

Does this change to prefer cd0 over http if both cddev and network are
available?  I'm not sure I like that choice.  I like the existing order
of http, cd, nfs, disk.