From 62352309a86bfc581195af028dddd4fcdd15f3ef Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 22 Oct 2016 19:51:32 +0000 Subject: [PATCH] Do not install NIS program rc script if WITHOUT_NIS is set PR: 213375 Submitted by: sergey@akhmatov.ru MFC after: 3 days --- etc/rc.d/Makefile | 7 +++++-- tools/build/mk/OptionalObsoleteFiles.inc | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index ad43a20a268f..320e550aeb8a 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b4b7a26a7521..cb17b4f029a9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6113,6 +6113,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt .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