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

WITHOUT_SERVICESDB:

Browse Source 
Add src.conf knob to disable the installation of /var/db/services.db

Default to leaving services.db in place, but allow the removal of the
file and its creation with a src.conf knob.

This file ends up being 2MB in size.  For small systems this is a waste
of space but its a tradeoff.

Reviewed by:	bdrewery
Differential Revision:	https://reviews.freebsd.org/D9655
This commit is contained in:
Sean Bruno 2018-07-04 17:18:35 +00:00
parent 968ac175e4
commit 6f077571b9
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/Makefile
View File

@ -192,12 +192,17 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \ ${BIN1} ${DESTDIR}/etc; \
cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
${DESTDIR}/etc/services; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
${BIN2} ${DESTDIR}/etc; \ ${BIN2} ${DESTDIR}/etc; \
${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_BSNMP} != "no" .if ${MK_BSNMP} != "no"
cd ${.CURDIR}; \ cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \

1
share/mk/src.opts.mk
View File

@ -160,6 +160,7 @@ __DEFAULT_YES_OPTIONS = \
RESCUE \ RESCUE \
ROUTED \ ROUTED \
SENDMAIL \ SENDMAIL \
SERVICESDB \
SETUID_LOGIN \ SETUID_LOGIN \
SHAREDOCS \ SHAREDOCS \
SOURCELESS \ SOURCELESS \

4
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -7527,6 +7527,10 @@ OLD_DIRS+=usr/share/sendmail/cf
OLD_DIRS+=usr/share/sendmail OLD_DIRS+=usr/share/sendmail
.endif .endif
.if ${MK_SERVICESDB} == no
OLD_FILES+=var/db/services.db
.endif
.if ${MK_SHAREDOCS} == no .if ${MK_SHAREDOCS} == no
OLD_FILES+=usr/share/doc/pjdfstest/README OLD_FILES+=usr/share/doc/pjdfstest/README
OLD_DIRS+=usr/share/doc/pjdfstest OLD_DIRS+=usr/share/doc/pjdfstest

3
tools/build/options/WITHOUT_SERVICESDB Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not install
.Pa /var/db/services.db .