On Wed, Aug 15, 2018, at 10:35 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
> > toor:*:0:0::0:0:Bourne-again Superuser:/root:
> > daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
> > operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
>
> --
> Rod Grimes rgri...@freebsd.org
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
