Re: svn commit: r347638 - in head: . etc lib/libc/gen
On Thu, May 23, 2019 at 05:50:52PM +, Brooks Davis wrote: > On Thu, May 23, 2019 at 07:46:21PM +0200, Kirill Ponomarev wrote: > > On 05/22, Conrad Meyer wrote: > > > Hi Brad, > > > > > > Ping. It's still broken. Can you revert this please? > > > > Please, revert these changes, it's still broken here as well. > > In addition the in-tree breakage for updates, the broke external update > systems and image building systems. I don't care what mechanism is > used (.PATH, ${SRCTOP}, something to tag the files in the src/etc > Makefile), but moving these files is unacceptable and should be > reverted. > > -- Brooks So before everyone goes further, manu and I are working on a version that should please everyone, and allow to revert any changes to mergemaster and etcupdate. Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r347638 - in head: . etc lib/libc/gen
-- Start of PGP signed section. > On Thu, May 23, 2019 at 07:46:21PM +0200, Kirill Ponomarev wrote: > > On 05/22, Conrad Meyer wrote: > > > Hi Brad, > > > > > > Ping. It's still broken. Can you revert this please? > > > > Please, revert these changes, it's still broken here as well. > > In addition the in-tree breakage for updates, the broke external update > systems and image building systems. I don't care what mechanism is > used (.PATH, ${SRCTOP}, something to tag the files in the src/etc > Makefile), but moving these files is unacceptable and should be > reverted. I may have another, temporary solution/sugestion. First revert this, then add a comment that while the pkgbase work is sorted out that these files live in 2 places and you must commit 2 both if you have to touch one of them. Then svn cp the files to the new location. Everyone happy with that temporary, hackash, work around so that both groups can move forward while all the sharp pointy sticks are cleaned up? Thanks, -- Rod Grimes rgri...@freebsd.org ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r347638 - in head: . etc lib/libc/gen
On Thu, May 23, 2019 at 07:46:21PM +0200, Kirill Ponomarev wrote: > On 05/22, Conrad Meyer wrote: > > Hi Brad, > > > > Ping. It's still broken. Can you revert this please? > > Please, revert these changes, it's still broken here as well. In addition the in-tree breakage for updates, the broke external update systems and image building systems. I don't care what mechanism is used (.PATH, ${SRCTOP}, something to tag the files in the src/etc Makefile), but moving these files is unacceptable and should be reverted. -- Brooks signature.asc Description: PGP signature
Re: svn commit: r347638 - in head: . etc lib/libc/gen
On 05/22, Conrad Meyer wrote: > Hi Brad, > > Ping. It's still broken. Can you revert this please? Please, revert these changes, it's still broken here as well. signature.asc Description: PGP signature
Re: svn commit: r347638 - in head: . etc lib/libc/gen
Hi Brad, Ping. It's still broken. Can you revert this please? Thanks, Conrad On Thu, May 16, 2019 at 8:05 AM Conrad Meyer wrote: > > Hi Brad, > > Can you revert this? It seems to break every config-management tool > we have (mergemaster, etcupdate, beinstall ...). > > Additionally, I don't believe this move has been justified — the cons > seem to outweigh the pros, if there are any. I skimmed the > differential and it was not immediately obvious what the benefit was. > The commit message describes what was changed, but not *why* you > thought it was a good idea. > > Thanks, > Conrad > > On Wed, May 15, 2019 at 6:09 PM Brad Davis wrote: > > > > Author: brd > > Date: Thu May 16 01:09:13 2019 > > New Revision: 347638 > > URL: https://svnweb.freebsd.org/changeset/base/347638 > > > > Log: > > Move master.passwd and group to lib/libc/gen/ > > > > libc was picked as the destination location for these because of the > > syscalls > > that use these files as the lowest level place they are referenced. > > > > Approved by: will (mentor), rgrimes, manu > > Differential Revision:https://reviews.freebsd.org/D16728 > > > > Added: > > head/lib/libc/gen/group > > - copied unchanged from r347637, head/etc/group > > head/lib/libc/gen/master.passwd > > - copied unchanged from r347637, head/etc/master.passwd > > Deleted: > > head/etc/group > > head/etc/master.passwd > > Modified: > > head/Makefile.inc1 > > head/etc/Makefile > > head/lib/libc/gen/Makefile.inc > > > > Modified: head/Makefile.inc1 > > == > > --- head/Makefile.inc1 Thu May 16 00:53:54 2019(r347637) > > +++ head/Makefile.inc1 Thu May 16 01:09:13 2019(r347638) > > @@ -871,8 +871,8 @@ DB_FROM_SRC=yes > > .endif > > > > .if defined(DB_FROM_SRC) > > -INSTALLFLAGS+= -N ${.CURDIR}/etc > > -MTREEFLAGS+= -N ${.CURDIR}/etc > > +INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen > > +MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen > > .endif > > _INSTALL_DDIR= ${DESTDIR}/${DISTDIR} > > INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} > > > > Modified: head/etc/Makefile > > == > > --- head/etc/Makefile Thu May 16 00:53:54 2019(r347637) > > +++ head/etc/Makefile Thu May 16 01:09:13 2019(r347638) > > @@ -15,7 +15,6 @@ SUBDIR+=sendmail > > .endif > > > > BIN1= \ > > - group \ > > login.access \ > > rc.bsdextended \ > > rc.firewall \ > > @@ -65,21 +64,7 @@ distribution: > > .endif > > cd ${.CURDIR}; \ > > ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > > - ${BIN1} ${DESTDIR}/etc; \ > > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ > > - master.passwd ${DESTDIR}/etc; > > - > > -.if ${MK_TCSH} == "no" > > - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd > > -.endif > > - pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd > > -.if defined(NO_ROOT) > > - ( \ > > - echo "./etc/passwd type=file mode=0644 uname=root > > gname=wheel"; \ > > - echo "./etc/pwd.db type=file mode=0644 uname=root > > gname=wheel"; \ > > - echo "./etc/spwd.db type=file mode=0600 uname=root > > gname=wheel"; \ > > - ) | ${METALOG.add} > > -.endif > > + ${BIN1} ${DESTDIR}/etc > > ${_+_}cd ${.CURDIR}/gss; ${MAKE} install > > ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install > > ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap > > > > Modified: head/lib/libc/gen/Makefile.inc > > == > > --- head/lib/libc/gen/Makefile.inc Thu May 16 00:53:54 2019 > > (r347637) > > +++ head/lib/libc/gen/Makefile.inc Thu May 16 01:09:13 2019 > > (r347638) > > @@ -4,7 +4,8 @@ > > # machine-independent gen sources > > .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen > > > > -CONFS= shells > > +CONFS+=group master.passwd shells > > +CONFSMODE_master.passwd= 600 > > > > SRCS+= __getosreldate.c \ > > __pthread_mutex_init_calloc_cb_stub.c \ > > @@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \ > > vis.3 svis.3 > > > > MLINKS+=wordexp.3 wordfree.3 > > + > > +afterinstallconfig: > > +.if ${MK_TCSH} == "no" > > + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd > > +.endif > > + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd > > +.if defined(NO_ROOT) && defined(METALOG) > > + ( \ > > + echo "./etc/pwd.db type=file mode=0644 uname=root > > gname=wheel"; \ > > + echo "./etc/spwd.db type=file mode=0600 uname=root > > gname=wheel"; \ > > + echo "./etc/passwd type=file mode=0644 uname=root > > gname=wheel"; \ > > + ) | cat -l >> ${METALOG} > > +.endif > >
Re: svn commit: r347638 - in head: . etc lib/libc/gen
On Thu, May 16, 2019 at 08:05:29AM -0700, Conrad Meyer wrote: > Hi Brad, > > Can you revert this? It seems to break every config-management tool > we have (mergemaster, etcupdate, beinstall ...). +1. > The commit message describes what was changed, but not *why* you > thought it was a good idea. > > > Added: > > head/lib/libc/gen/group > > - copied unchanged from r347637, head/etc/group > > head/lib/libc/gen/master.passwd > > - copied unchanged from r347637, head/etc/master.passwd What was wrong with etc/? What can be more logical than this? libc/gen/ makes so no sense. ./danfe ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r347638 - in head: . etc lib/libc/gen
Hi Brad, Can you revert this? It seems to break every config-management tool we have (mergemaster, etcupdate, beinstall ...). Additionally, I don't believe this move has been justified — the cons seem to outweigh the pros, if there are any. I skimmed the differential and it was not immediately obvious what the benefit was. The commit message describes what was changed, but not *why* you thought it was a good idea. Thanks, Conrad On Wed, May 15, 2019 at 6:09 PM Brad Davis wrote: > > Author: brd > Date: Thu May 16 01:09:13 2019 > New Revision: 347638 > URL: https://svnweb.freebsd.org/changeset/base/347638 > > Log: > Move master.passwd and group to lib/libc/gen/ > > libc was picked as the destination location for these because of the > syscalls > that use these files as the lowest level place they are referenced. > > Approved by: will (mentor), rgrimes, manu > Differential Revision:https://reviews.freebsd.org/D16728 > > Added: > head/lib/libc/gen/group > - copied unchanged from r347637, head/etc/group > head/lib/libc/gen/master.passwd > - copied unchanged from r347637, head/etc/master.passwd > Deleted: > head/etc/group > head/etc/master.passwd > Modified: > head/Makefile.inc1 > head/etc/Makefile > head/lib/libc/gen/Makefile.inc > > Modified: head/Makefile.inc1 > == > --- head/Makefile.inc1 Thu May 16 00:53:54 2019(r347637) > +++ head/Makefile.inc1 Thu May 16 01:09:13 2019(r347638) > @@ -871,8 +871,8 @@ DB_FROM_SRC=yes > .endif > > .if defined(DB_FROM_SRC) > -INSTALLFLAGS+= -N ${.CURDIR}/etc > -MTREEFLAGS+= -N ${.CURDIR}/etc > +INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen > +MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen > .endif > _INSTALL_DDIR= ${DESTDIR}/${DISTDIR} > INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} > > Modified: head/etc/Makefile > == > --- head/etc/Makefile Thu May 16 00:53:54 2019(r347637) > +++ head/etc/Makefile Thu May 16 01:09:13 2019(r347638) > @@ -15,7 +15,6 @@ SUBDIR+=sendmail > .endif > > BIN1= \ > - group \ > login.access \ > rc.bsdextended \ > rc.firewall \ > @@ -65,21 +64,7 @@ distribution: > .endif > cd ${.CURDIR}; \ > ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > - ${BIN1} ${DESTDIR}/etc; \ > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ > - master.passwd ${DESTDIR}/etc; > - > -.if ${MK_TCSH} == "no" > - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd > -.endif > - pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd > -.if defined(NO_ROOT) > - ( \ > - echo "./etc/passwd type=file mode=0644 uname=root > gname=wheel"; \ > - echo "./etc/pwd.db type=file mode=0644 uname=root > gname=wheel"; \ > - echo "./etc/spwd.db type=file mode=0600 uname=root > gname=wheel"; \ > - ) | ${METALOG.add} > -.endif > + ${BIN1} ${DESTDIR}/etc > ${_+_}cd ${.CURDIR}/gss; ${MAKE} install > ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install > ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap > > Modified: head/lib/libc/gen/Makefile.inc > == > --- head/lib/libc/gen/Makefile.inc Thu May 16 00:53:54 2019 > (r347637) > +++ head/lib/libc/gen/Makefile.inc Thu May 16 01:09:13 2019 > (r347638) > @@ -4,7 +4,8 @@ > # machine-independent gen sources > .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen > > -CONFS= shells > +CONFS+=group master.passwd shells > +CONFSMODE_master.passwd= 600 > > SRCS+= __getosreldate.c \ > __pthread_mutex_init_calloc_cb_stub.c \ > @@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \ > vis.3 svis.3 > > MLINKS+=wordexp.3 wordfree.3 > + > +afterinstallconfig: > +.if ${MK_TCSH} == "no" > + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd > +.endif > + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd > +.if defined(NO_ROOT) && defined(METALOG) > + ( \ > + echo "./etc/pwd.db type=file mode=0644 uname=root > gname=wheel"; \ > + echo "./etc/spwd.db type=file mode=0600 uname=root > gname=wheel"; \ > + echo "./etc/passwd type=file mode=0644 uname=root > gname=wheel"; \ > + ) | cat -l >> ${METALOG} > +.endif > > Copied: head/lib/libc/gen/group (from r347637, head/etc/group) > == > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/lib/libc/gen/group Thu May 16 01:09:13 2019(r347638, > copy of r347637, head/etc/group) > @@ -0,0 +1,36 @@ > +# $FreeBSD$ > +# > +wheel:*:0:root > +daemon:*:1: > +
Re: svn commit: r347638 - in head: . etc lib/libc/gen
usr.sbin/etcupdate/tests/preworld_test.sh: $SRC/etc/master.passwd usr.sbin/mergemaster/mergemaster.sh: cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && I suspect there are more places than these 2 that need to be fixed still. This was a very lazy grep. Sadly I think it should be reverted until further tool analysis is done. Both internal and external. Why a subdir of libc rather than just libc/? This is very oddly placed. Is there a libc-gen package? On 2019-05-16 11:05, Conrad Meyer wrote: Hi Brad, Can you revert this? It seems to break every config-management tool we have (mergemaster, etcupdate, beinstall ...). Additionally, I don't believe this move has been justified — the cons seem to outweigh the pros, if there are any. I skimmed the differential and it was not immediately obvious what the benefit was. The commit message describes what was changed, but not *why* you thought it was a good idea. Thanks, Conrad On Wed, May 15, 2019 at 6:09 PM Brad Davis wrote: Author: brd Date: Thu May 16 01:09:13 2019 New Revision: 347638 URL: https://svnweb.freebsd.org/changeset/base/347638 Log: Move master.passwd and group to lib/libc/gen/ libc was picked as the destination location for these because of the syscalls that use these files as the lowest level place they are referenced. Approved by: will (mentor), rgrimes, manu Differential Revision:https://reviews.freebsd.org/D16728 Added: head/lib/libc/gen/group - copied unchanged from r347637, head/etc/group head/lib/libc/gen/master.passwd - copied unchanged from r347637, head/etc/master.passwd Deleted: head/etc/group head/etc/master.passwd Modified: head/Makefile.inc1 head/etc/Makefile head/lib/libc/gen/Makefile.inc Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Thu May 16 00:53:54 2019(r347637) +++ head/Makefile.inc1 Thu May 16 01:09:13 2019(r347638) @@ -871,8 +871,8 @@ DB_FROM_SRC=yes .endif .if defined(DB_FROM_SRC) -INSTALLFLAGS+= -N ${.CURDIR}/etc -MTREEFLAGS+= -N ${.CURDIR}/etc +INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen +MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen .endif _INSTALL_DDIR= ${DESTDIR}/${DISTDIR} INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} Modified: head/etc/Makefile == --- head/etc/Makefile Thu May 16 00:53:54 2019(r347637) +++ head/etc/Makefile Thu May 16 01:09:13 2019(r347638) @@ -15,7 +15,6 @@ SUBDIR+=sendmail .endif BIN1= \ - group \ login.access \ rc.bsdextended \ rc.firewall \ @@ -65,21 +64,7 @@ distribution: .endif cd ${.CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd ${DESTDIR}/etc; - -.if ${MK_TCSH} == "no" - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd -.endif - pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd -.if defined(NO_ROOT) - ( \ - echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ - ) | ${METALOG.add} -.endif + ${BIN1} ${DESTDIR}/etc ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap Modified: head/lib/libc/gen/Makefile.inc == --- head/lib/libc/gen/Makefile.inc Thu May 16 00:53:54 2019 (r347637) +++ head/lib/libc/gen/Makefile.inc Thu May 16 01:09:13 2019 (r347638) @@ -4,7 +4,8 @@ # machine-independent gen sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen -CONFS= shells +CONFS+=group master.passwd shells +CONFSMODE_master.passwd= 600 SRCS+= __getosreldate.c \ __pthread_mutex_init_calloc_cb_stub.c \ @@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \ vis.3 svis.3 MLINKS+=wordexp.3 wordfree.3 + +afterinstallconfig: +.if ${MK_TCSH} == "no" + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd +.endif + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd +.if defined(NO_ROOT) && defined(METALOG) + ( \ + echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ + echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + ) | cat -l >> ${METALOG} +.endif Copied: head/lib/libc/gen/group (from r347637, head/etc/group) =
svn commit: r347638 - in head: . etc lib/libc/gen
Author: brd Date: Thu May 16 01:09:13 2019 New Revision: 347638 URL: https://svnweb.freebsd.org/changeset/base/347638 Log: Move master.passwd and group to lib/libc/gen/ libc was picked as the destination location for these because of the syscalls that use these files as the lowest level place they are referenced. Approved by: will (mentor), rgrimes, manu Differential Revision:https://reviews.freebsd.org/D16728 Added: head/lib/libc/gen/group - copied unchanged from r347637, head/etc/group head/lib/libc/gen/master.passwd - copied unchanged from r347637, head/etc/master.passwd Deleted: head/etc/group head/etc/master.passwd Modified: head/Makefile.inc1 head/etc/Makefile head/lib/libc/gen/Makefile.inc Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Thu May 16 00:53:54 2019(r347637) +++ head/Makefile.inc1 Thu May 16 01:09:13 2019(r347638) @@ -871,8 +871,8 @@ DB_FROM_SRC=yes .endif .if defined(DB_FROM_SRC) -INSTALLFLAGS+= -N ${.CURDIR}/etc -MTREEFLAGS+= -N ${.CURDIR}/etc +INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen +MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen .endif _INSTALL_DDIR= ${DESTDIR}/${DISTDIR} INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} Modified: head/etc/Makefile == --- head/etc/Makefile Thu May 16 00:53:54 2019(r347637) +++ head/etc/Makefile Thu May 16 01:09:13 2019(r347638) @@ -15,7 +15,6 @@ SUBDIR+=sendmail .endif BIN1= \ - group \ login.access \ rc.bsdextended \ rc.firewall \ @@ -65,21 +64,7 @@ distribution: .endif cd ${.CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd ${DESTDIR}/etc; - -.if ${MK_TCSH} == "no" - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd -.endif - pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd -.if defined(NO_ROOT) - ( \ - echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ - ) | ${METALOG.add} -.endif + ${BIN1} ${DESTDIR}/etc ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap Modified: head/lib/libc/gen/Makefile.inc == --- head/lib/libc/gen/Makefile.inc Thu May 16 00:53:54 2019 (r347637) +++ head/lib/libc/gen/Makefile.inc Thu May 16 01:09:13 2019 (r347638) @@ -4,7 +4,8 @@ # machine-independent gen sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen -CONFS= shells +CONFS+=group master.passwd shells +CONFSMODE_master.passwd= 600 SRCS+= __getosreldate.c \ __pthread_mutex_init_calloc_cb_stub.c \ @@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \ vis.3 svis.3 MLINKS+=wordexp.3 wordfree.3 + +afterinstallconfig: +.if ${MK_TCSH} == "no" + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd +.endif + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd +.if defined(NO_ROOT) && defined(METALOG) + ( \ + echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ + echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + ) | cat -l >> ${METALOG} +.endif Copied: head/lib/libc/gen/group (from r347637, head/etc/group) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/gen/group Thu May 16 01:09:13 2019(r347638, copy of r347637, head/etc/group) @@ -0,0 +1,36 @@ +# $FreeBSD$ +# +wheel:*:0:root +daemon:*:1: +kmem:*:2: +sys:*:3: +tty:*:4: +operator:*:5:root +mail:*:6: +bin:*:7: +news:*:8: +man:*:9: +games:*:13: +ftp:*:14: +staff:*:20: +sshd:*:22: +smmsp:*:25: +mailnull:*:26: +guest:*:31: +video:*:44: +bind:*:53: +unbound:*:59: +proxy:*:62: +authpf:*:63: +_pflogd:*:64: +_dhcp:*:65: +uucp:*:66: +dialer:*:68: +network:*:69: +audit:*:77: +www:*:80: +ntpd:*:123: +_ypldap:*:160: +hast:*:845: +nogroup:*:65533: +nobody:*:65534: Copied: head/lib/libc/gen/master.passwd (from r347637, head/etc/master.passwd) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/gen/master.passwd Thu May 16 01:09:13 2019 (r347638, cop