On Fri, Oct 18, 2019 at 05:22:31AM +0300, [email protected] wrote: > >Synopsis: /etc/installurl ignored in sysupgrade(8) > >Category: system > >Environment: > System : OpenBSD 6.6 > Details : OpenBSD 6.6 (GENERIC) #353: Sat Oct 12 10:45:56 MDT 2019 > > [email protected]:/usr/src/sys/arch/amd64/compile/GENERIC > > Architecture: OpenBSD.amd64 > Machine : amd64 > >Description: > /etc/installurl is ignored in sysupgrade because it appears > a backslash has gone AWOL, and cdn.openbsd.org is used instead > >How-To-Repeat: > attempt an sysupgrade with a custom /etc/instalurl > >Fix: > > ------8<------8<------8<------8<------8<------8<------8<------8<--- > Index: sysupgrade/sysupgrade.sh > =================================================================== > RCS file: /cvs/src/usr.sbin/sysupgrade/sysupgrade.sh,v > retrieving revision 1.26 > diff -u -p -r1.26 sysupgrade.sh > --- sysupgrade/sysupgrade.sh Fri Oct 18 05:08:47 2019 > +++ sysupgrade/sysupgrade.sh Fri Oct 15 03:11:19 2019 > @@ -99,7 +99,7 @@ > shift $(( OPTIND -1 )) > > case $# in > -0) MIRROR=$(sed 's/#.*//;/^$/d' /etc/installurl) 2>/dev/null || > +0) MIRROR=$(sed 's/#.*//;/^$/d' /etc/installurl) 2>/dev/null || \ > MIRROR=https://cdn.openbsd.org/pub/OpenBSD
There really is no need for a line continuation here. It's perfectly legal shell syntax to use variable=$( some-command ) || variable=other-value Regards, Kusalananda
