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

Conditionally install /etc/rc.d/audit* based on ${MK_AUDIT}

Browse Source 
/usr/sbin/audit(dist)?d are only installed if ${MK_AUDIT} == yes. Their
supporting scripts should only be installed in those instances as well.

Submitted by:	ngie
Reviewed by:	emaste
MFC after:	2 weeks
Pull Request:	https://github.com/freebsd/freebsd/pull/242
This commit is contained in:
Alan Somers 2018-12-16 23:38:46 +00:00
parent 96a3750174
commit 738ea87196
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libexec/rc/rc.d/Makefile
View File

@ -15,8 +15,6 @@ CONFS= DAEMON \
addswap \ addswap \
adjkerntz \ adjkerntz \
archdep \ archdep \
auditd \
auditdistd \
bgfsck \ bgfsck \
${_blacklistd} \ ${_blacklistd} \
${_bluetooth} \ ${_bluetooth} \
@ -164,6 +162,12 @@ APM+= apmd
APMPACKAGE= apm APMPACKAGE= apm
.endif .endif
.if ${MK_AUDIT} != "no"
CONFGROUPS+= AUDIT
AUDIT+= auditd
AUDIT+= auditdistd
.endif
.if ${MK_AUTOFS} != "no" .if ${MK_AUTOFS} != "no"
CONFS+= automount CONFS+= automount
CONFS+= automountd CONFS+= automountd

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

@ -147,6 +147,8 @@ OLD_FILES+=usr/share/man/man3/unistruct.3.gz
.endif .endif
.if ${MK_AUDIT} == no .if ${MK_AUDIT} == no
OLD_FILES+=etc/rc.d/auditd
OLD_FILES+=etc/rc.d/auditdistd
OLD_FILES+=usr/sbin/audit OLD_FILES+=usr/sbin/audit
OLD_FILES+=usr/sbin/auditd OLD_FILES+=usr/sbin/auditd
OLD_FILES+=usr/sbin/auditdistd OLD_FILES+=usr/sbin/auditdistd