Author: asomers
Date: Sun Dec 16 23:38:46 2018
New Revision: 342153
URL: https://svnweb.freebsd.org/changeset/base/342153
Log:
Conditionally install /etc/rc.d/audit* based on ${MK_AUDIT}
/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
Modified:
head/libexec/rc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile Sun Dec 16 18:10:55 2018
(r342152)
+++ head/libexec/rc/rc.d/Makefile Sun Dec 16 23:38:46 2018
(r342153)
@@ -15,8 +15,6 @@ CONFS= DAEMON \
addswap \
adjkerntz \
archdep \
- auditd \
- auditdistd \
bgfsck \
${_blacklistd} \
${_bluetooth} \
@@ -162,6 +160,12 @@ APM+= apm
APM+= apmd
.endif
APMPACKAGE= apm
+.endif
+
+.if ${MK_AUDIT} != "no"
+CONFGROUPS+= AUDIT
+AUDIT+= auditd
+AUDIT+= auditdistd
.endif
.if ${MK_AUTOFS} != "no"
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Dec 16 18:10:55
2018 (r342152)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Dec 16 23:38:46
2018 (r342153)
@@ -147,6 +147,8 @@ OLD_FILES+=usr/share/man/man3/unistruct.3.gz
.endif
.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/auditd
OLD_FILES+=usr/sbin/auditdistd
_______________________________________________
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"
