svn commit: r299167 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk
Garrett Cooper
ngie at FreeBSD.org
Fri May 6 08:59:42 UTC 2016
Author: ngie
Date: Fri May 6 08:59:40 2016
New Revision: 299167
URL: https://svnweb.freebsd.org/changeset/base/299167
Log:
Checkpoint WIP to only install NIS rc.d scripts when MK_NIS != no
It still needs some work in keyserv/quotas with ypset.. neither
case seems to directly need NIS -- they just need NIS to be setup
beforehand
Add explicit rpcbind REQUIREs to keyserv and ypbind because they
start rpcbind via force_depend
Modified:
user/ngie/detangle-rc/etc/rc.d/Makefile
user/ngie/detangle-rc/etc/rc.d/keyserv
user/ngie/detangle-rc/etc/rc.d/ypbind
user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc
Modified: user/ngie/detangle-rc/etc/rc.d/Makefile
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/Makefile Fri May 6 08:59:25 2016 (r299166)
+++ user/ngie/detangle-rc/etc/rc.d/Makefile Fri May 6 08:59:40 2016 (r299167)
@@ -72,7 +72,6 @@ FILES= DAEMON \
nfscbd \
nfsd \
nfsuserd \
- nisdomain \
${_nscd} \
nsswitch \
ntpdate \
@@ -107,12 +106,6 @@ FILES= DAEMON \
${_utx} \
var \
watchdogd \
- ypbind \
- yppasswdd \
- ypserv \
- ypset \
- ypupdated \
- ypxfrd \
.if ${MK_ACCT} != "no"
FILESGROUPS+= ACCT
@@ -249,6 +242,18 @@ _kpasswdd= kpasswdd
FILES+= othermta
.endif
+.if ${MK_NIS} != "no"
+FILESGROUPS+= NIS
+NIS+= nisdomain
+NIS+= ypbind
+NIS+= yppasswdd
+NIS+= ypserv
+NIS+= ypset
+NIS+= ypupdated
+NIS+= ypxfrd
+NISPACKAGE= nis
+.endif
+
.if ${MK_NS_CACHING} != "no"
_nscd= nscd
.endif
Modified: user/ngie/detangle-rc/etc/rc.d/keyserv
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/keyserv Fri May 6 08:59:25 2016 (r299166)
+++ user/ngie/detangle-rc/etc/rc.d/keyserv Fri May 6 08:59:40 2016 (r299167)
@@ -6,7 +6,7 @@
# Start keyserv if we are running Secure RPC
# PROVIDE: keyserv
-# REQUIRE: ypset
+# REQUIRE: rpcbind ypset
# BEFORE: DAEMON
# KEYWORD: shutdown
Modified: user/ngie/detangle-rc/etc/rc.d/ypbind
==============================================================================
--- user/ngie/detangle-rc/etc/rc.d/ypbind Fri May 6 08:59:25 2016 (r299166)
+++ user/ngie/detangle-rc/etc/rc.d/ypbind Fri May 6 08:59:40 2016 (r299167)
@@ -4,7 +4,7 @@
#
# PROVIDE: ypbind
-# REQUIRE: ypserv
+# REQUIRE: rpcbind ypserv
# BEFORE: DAEMON
# KEYWORD: shutdown
Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Fri May 6 08:59:25 2016 (r299166)
+++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Fri May 6 08:59:40 2016 (r299167)
@@ -6014,6 +6014,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N
.endif
.if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/nisdomain
+OLD_FILES+=etc/rc.d/ypbind
+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
More information about the svn-src-user
mailing list