It does not seem crucial to commit this just before a release.

Klemens Nanni <k...@openbsd.org> wrote:

> On Fri, Sep 29, 2023 at 05:28:46PM +0200, Florian Obser wrote:
> > On 2023-09-29 14:41 UTC, Klemens Nanni <k...@openbsd.org> wrote:
> > > The response file contains only to non-defaults, except for
> > >   Set name(s)? (or 'abort' or 'done') [done] done
> > >
> > > which is the hardcoded default since 2009:
> > >           ask "Set name(s)? (or 'abort' or 'done')" done
> > >
> > > We pass it since r1.23 in 2019
> > >     Let sysupgrade(8) create auto_upgrade.conf file in preparation of
> > >     moving the functionality out of install.sub.
> > >     OK deraadt
> > >
> > > I see no need for explicit defaults.
> > > sysupgrade(8) and installer work the same with this diff.
> > 
> > I have a very vague recollection that there was a reason to have this
> > but I can't put my finger on it. Something like the installer would spin
> > on selecting the sets while we were developing this inside of
> > install.sub. It was probably some other mistake that got fixed and this
> > is a left-over.
> 
> I don't recall that, but will certainly check on it, thanks.
> 
> > 
> > Anyway, soon a lot of people are going to try sysupgrade in all kinds of
> > weird setups, now is a good time to put this in, IFF you have the time
> > to keep an eye on that it doesn't break. You also want deraadt@ on board
> > for this.
> > 
> > With all those constraints met, OK florian (I *don't* have time to keep an
> > eye on it.)
> 
> No need to push this before release and create potential problems.
> I just sent the diff now so as not to forget about it (again).
> 
> > 
> > 
> > >
> > > Index: sysupgrade.sh
> > > ===================================================================jk
> > > RCS file: /cvs/src/usr.sbin/sysupgrade/sysupgrade.sh,v
> > > retrieving revision 1.48
> > > diff -u -p -r1.48 sysupgrade.sh
> > > --- sysupgrade.sh 8 Jun 2022 09:03:11 -0000       1.48
> > > +++ sysupgrade.sh 29 Sep 2023 13:48:18 -0000
> > > @@ -185,7 +185,6 @@ fi
> > >  cat <<__EOT >/auto_upgrade.conf
> > >  Location of sets = disk
> > >  Pathname to the sets = ${SETSDIR}/
> > > -Set name(s) = done
> > >  Directory does not contain SHA256.sig. Continue without verification = 
> > > yes
> > >  __EOT
> > >  
> > >
> > 
> > -- 
> > In my defence, I have been left unsupervised.
> > 
> 

Reply via email to