Author: bapt
Date: Sat Oct 22 19:51:32 2016
New Revision: 307786
URL: https://svnweb.freebsd.org/changeset/base/307786
Log:
Do not install NIS program rc script if WITHOUT_NIS is set
PR: 213375
Submitted by: ser...@akhmatov.ru
MFC after: 3 days
Modified:
head/etc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile Sat Oct 22 19:36:12 2016 (r307785)
+++ head/etc/rc.d/Makefile Sat Oct 22 19:51:32 2016 (r307786)
@@ -118,14 +118,17 @@ FILES= DAEMON \
ugidfw \
${_utx} \
var \
- watchdogd \
- ypbind \
+ watchdogd
+
+.if ${MK_NIS} != "no"
+FILES+= ypbind \
ypldap \
yppasswdd \
ypserv \
ypset \
ypupdated \
ypxfrd
+.endif
.if ${MK_ACCT} != "no"
FILESGROUPS+= ACCT
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 19:36:12
2016 (r307785)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 19:51:32
2016 (r307786)
@@ -6113,6 +6113,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N
.endif
.if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/ypbind
+OLD_FILES+=etc/rc.d/ypldap
+OLD_FILES+=etc/rc.d/yppasswdd
+OLD_FILES+=etc/rc.d/ypserv
+OLD_FILES+=etc/rc.d/ypset
+OLD_FILES+=etc/rc.d/ypupdated
+OLD_FILES+=etc/rc.d/ypxfrd
OLD_FILES+=usr/bin/ypcat
OLD_FILES+=usr/bin/ypchfn
OLD_FILES+=usr/bin/ypchpass
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
