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 <b...@freebsd.org> 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: > +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, copy of r347637, head/etc/master.passwd) > @@ -0,0 +1,28 @@ > +# $FreeBSD$ > +# > +root::0:0::0:0:Charlie &:/root:/bin/csh > +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 > +bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin > +tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin > +kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin > +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin > +news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin > +man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin > +sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin > +smmsp:*:25:25::0:0:Sendmail Submission > User:/var/spool/clientmqueue:/usr/sbin/nologin > +mailnull:*:26:26::0:0:Sendmail Default > User:/var/spool/mqueue:/usr/sbin/nologin > +bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin > +unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin > +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin > +_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin > +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin > +uucp:*:66:66::0:0:UUCP > pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico > +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin > +auditdistd:*:78:77::0:0:Auditdistd unprivileged > user:/var/empty:/usr/sbin/nologin > +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin > +ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin > +_ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin > +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin > +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin > _______________________________________________ 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"
