svn commit: r337857 - in head: bin/csh bin/sh etc

[Rodney W. Grimes]

> On Wed, Aug 15, 2018, at 11:34 AM, Rodney W. Grimes wrote:
> > > > > Author: brd
> > > > > Date: Wed Aug 15 16:22:12 2018
> > > > > New Revision: 337857
> > > > > URL: https://svnweb.freebsd.org/changeset/base/337857
> > > > > 
> > > > > Log:
> > > > >   Fix build after r337849
> > > > >   
> > > > >   This moves the symlink creation to after where the files are installed.
> > > > >   
> > > > >   This also inverts the shell change so that it only happens if MK_TCSH is on.
> > > > >   
> > > > >   Approved by:	will (mentor)
> > > > >   Differential Revision:	https://reviews.freebsd.org/D16725
> > > > > 
> > > > > Modified:
> > > > >   head/bin/csh/Makefile
> > > > >   head/bin/sh/Makefile
> > > > >   head/etc/master.passwd
> > > > > 
> > > > > Modified: head/bin/csh/Makefile
> > > > > ==============================================================================
> > > > > --- head/bin/csh/Makefile	Wed Aug 15 16:16:59 2018	(r337856)
> > > > > +++ head/bin/csh/Makefile	Wed Aug 15 16:22:12 2018	(r337857)
> > > > > @@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
> > > > >  
> > > > >  LIBADD=	termcapw crypt
> > > > >  
> > > > > -LINKS=	${BINDIR}/csh ${BINDIR}/tcsh \
> > > > > -	/root/.cshrc /.cshrc
> > > > > +LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
> > > > >  
> > > > >  CLEANFILES= ${GENHDRS} gethost csh.1
> > > > >  
> > > > > @@ -158,7 +157,7 @@ beforeinstall:
> > > > >  	rm -f ${DESTDIR}/.cshrc
> > > > >  
> > > > >  afterinstallconfig:
> > > > > -	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
> > > > > +	sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
> > > > >  	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
> > > > >  
> > > > >  .include <bsd.prog.mk>
> > > > > 
> > > > > Modified: head/bin/sh/Makefile
> > > > > ==============================================================================
> > > > > --- head/bin/sh/Makefile	Wed Aug 15 16:16:59 2018	(r337856)
> > > > > +++ head/bin/sh/Makefile	Wed Aug 15 16:22:12 2018	(r337857)
> > > > > @@ -37,7 +37,6 @@ WFORMAT=0
> > > > >  
> > > > >  CLEANFILES+= mknodes mksyntax
> > > > >  CLEANFILES+= ${GENSRCS} ${GENHDRS}
> > > > > -LINKS=	/root/.profile /.profile
> > > > >  
> > > > >  build-tools: mknodes mksyntax
> > > > >  
> > > > > @@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+= tests
> > > > >  
> > > > >  beforeinstall:
> > > > >  	rm -f ${DESTDIR}/.profile
> > > > 
> > > > Still unconditionally removing /.profile, but only replacing it
> > > > when installconfig: is run.
> > > 
> > > Yes, working on a separate review for this..
> > > 
> > > > > +
> > > > > +afterinstallconfig:
> > > > > +	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
> > > > >  
> > > > >  .include <bsd.prog.mk>
> > > > > 
> > > > > Modified: head/etc/master.passwd
> > > > > ==============================================================================
> > > > > --- head/etc/master.passwd	Wed Aug 15 16:16:59 2018	(r337856)
> > > > > +++ head/etc/master.passwd	Wed Aug 15 16:22:12 2018	(r337857)
> > > > > @@ -1,6 +1,6 @@
> > > > >  # $FreeBSD$
> > > > >  #
> > > > > -root::0:0::0:0:Charlie &:/root:/bin/csh
> > > > > +root::0:0::0:0:Charlie &:/root:/bin/sh
> > > > 
> > > > I strongly object to this change to master.passwd, and feel it should
> > > > be worked around if in anyway possible.  I have pointed out in the
> > > > review ways to not have to make this change.
> > > 
> > > I opened up the following which addresses some of your feedback:
> > > https://reviews.freebsd.org/D16728
> > 
> > Bleh, can we revert all of this, and take a second look with many more
> > eyes on this.  master.passwd coming from libc makes my head hurt!
> > 
> > Also this is now a patch on a patch on a patch, time to end the dive
> > down the rabbit hole!
> 
> Yes, I did a partial revert of the problematic spots in r337882.

:-(  Partial reverts are a really bad idea, as only you know what
parts of what commit got reverted, and when someone is reading
svn log stuff on a file that you did not revert there is no
revert to the change that went there.. and well.. its a messy can
of worms.

I would encorage you to rethink that as an approach for future work.

> 
> I will redo with a better approach tomorrow.

Please include those people that commented about all the different
little pointy edges in that review.

> 
> Sorry for the trouble and your .cshrc getting clobbered.

Thankfully I isolate build machines, so it only effected one system.

-- 
Rod Grimes                                                 rgrimes at freebsd.org