d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move services to usr.sbin/services_mkdb/

Browse Source 
This is pkgbase related as it switches to CONFS to properly tag this as a
config file.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16848
This commit is contained in:
Brad Davis 2018-08-22 21:22:40 +00:00
parent 36716fe2e6
commit 376a4e3255
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/Makefile
View File

@ -36,7 +36,6 @@ BIN1= crontab \
rc.firewall \ rc.firewall \
remote \ remote \
rpc \ rpc \
services \
termcap.small termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys) .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@ -122,12 +121,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
.if ${MK_SERVICESDB} != "no"
cd ${.CURDIR}; \
services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
${DESTDIR}/etc/services;
.endif
.if ${MK_TCSH} == "no" .if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif .endif
@ -138,7 +131,6 @@ distribution:
echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ 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/pwd.db type=file mode=0644 uname=root gname=wheel"; \
echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
) | ${METALOG.add} ) | ${METALOG.add}
.endif .endif
${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install

13
usr.sbin/services_mkdb/Makefile
View File

@ -1,7 +1,20 @@
# $FreeBSD$ # $FreeBSD$
CONFS= services
PROG= services_mkdb PROG= services_mkdb
MAN= services_mkdb.8 MAN= services_mkdb.8
SRCS= services_mkdb.c uniq.c extern.h SRCS= services_mkdb.c uniq.c extern.h
.include <bsd.endian.mk>
.include <src.opts.mk>
.if ${MK_SERVICESDB} != "no"
afterinstallconfig:
services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
${DESTDIR}/etc/services
.if defined(NO_ROOT) && defined(METALOG)
echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel" | \
cat -l >> ${METALOG}
.endif
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

0
etc/services → usr.sbin/services_mkdb/services
View File