From owner-svn-src-user@freebsd.org Fri May 6 08:59:42 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45CADB2E289 for ; Fri, 6 May 2016 08:59:42 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 061411504; Fri, 6 May 2016 08:59:41 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u468xfIi084689; Fri, 6 May 2016 08:59:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u468xeg9084685; Fri, 6 May 2016 08:59:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605060859.u468xeg9084685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 6 May 2016 08:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r299167 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2016 08:59:42 -0000 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