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
This commit is contained in:
parent
0f461ea925
commit
b35b7d2f49
@ -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:/$::}
|
||||
|
17
etc/Makefile
17
etc/Makefile
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user