On Sun, Mar 04, 2018 at 05:49:52PM +0000, Andrew Marks wrote:
> The below allows "ftp://"; url in /etc/installurl.
> 
> Now the discussion part, there are at least three utilities I know of
> which use /etc/installurl to find OpenBSD "sources"
> 1. syspatch
> 2. pkg_add
> 3. installation (I don't know the exact name)
> 
> There may be others which are all
> 1. verifiying that /etc/installurl is valid
> 2. fetching things
> 3. verifying checksums
> 
> Which may be cause to consolidate those things into a single utility?
> 
> Any thoughts?

Committed, thanks :-)

> --- syspatch.sh       29 Dec 2017 18:56:36 -0000      1.134
> +++ syspatch.sh       4 Mar 2018 17:41:41 -0000
> @@ -264,7 +264,7 @@ _OSrev=${_KERNV[0]%.*}${_KERNV[0]#*.}
>  
>  _MIRROR=$(while read _line; do _line=${_line%%#*}; [[ -n ${_line} ]] &&
>       print -r -- "${_line}"; done </etc/installurl | tail -1) 2>/dev/null
> -[[ ${_MIRROR} == @(file|http|https)://* ]] ||
> +[[ ${_MIRROR} == @(ftp|file|http|https)://* ]] ||
>       sp_err "${0##*/}: invalid URL configured in /etc/installurl"
>  _MIRROR="${_MIRROR}/syspatch/${_KERNV[0]}/$(machine)"
>  
> 

-- 
Antoine

Reply via email to