From: "Omar Polo" <op@omarpolo.com>
Subject: Re: sysupgrade vs NFS
To: Marc Espie <marc.espie.openbsd@gmail.com>
Cc: Alexander Hall <alexander@beard.se>, tech@openbsd.org, Lucas Gabriel Vuotto <lucas@sexy.is>
Date: Sat, 14 Jun 2025 15:40:47 +0200

Marc Espie <marc.espie.openbsd@gmail.com> wrote:
> Thanks for the feedback.
> 
> Here's a better patch.
> 
> I've left out the usage of err for now, because it's not consistently
> used in that script.

err() seems slightly more used in this script: 4 uses vs 3 'exit 1' but
whatever.  two style nits below but otherwise fwiw ok op@

> Index: sysupgrade.8
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.sbin/sysupgrade/sysupgrade.8,v
> diff -u -p -r1.13 sysupgrade.8
> --- sysupgrade.8	8 Jun 2022 09:03:11 -0000	1.13
> +++ sysupgrade.8	14 Jun 2025 10:23:50 -0000
> @@ -99,3 +99,6 @@ Directory the upgrade is downloaded to.
>  .Nm
>  first appeared in
>  .Ox 6.6 .
> +.Sh BUGS AND LIMITATIONS

CAVEATS seems a more appropriate section name

> +.Nm
> +currently does not support downloading the sets to a NFS or MFS partition.
> Index: sysupgrade.sh
> ===================================================================
> RCS file: /build/data/openbsd/cvs/src/usr.sbin/sysupgrade/sysupgrade.sh,v
> diff -u -p -r1.52 sysupgrade.sh
> --- sysupgrade.sh	19 Jun 2024 05:22:33 -0000	1.52
> +++ sysupgrade.sh	14 Jun 2025 10:21:06 -0000
> @@ -132,6 +132,11 @@ fi
>  
>  install -d -o 0 -g 0 -m 0755 ${SETSDIR}
>  cd ${SETSDIR}
> +if df -t nfs,mfs ${SETSDIR} >/dev/null 2>/dev/null
> +then

style nit: for consistency with the rest of the script, please use

if dt ... >/dev/null 2>&1; then

> +	echo "Error: ${SETSDIR} on NFS or MFS is currently not supported"
> +	exit 1
> +fi
>  
>  echo "Fetching from ${URL}"
>  unpriv -f SHA256.sig ftp -N sysupgrade -Vmo SHA256.sig ${URL}SHA256.sig