svn commit: r271893 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sat Sep 20 06:05:24 2014
New Revision: 271893
URL: http://svnweb.freebsd.org/changeset/base/271893

Log:
  Don't install /etc/rc.d/rwho unless MK_RCMDS == yes
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Sat Sep 20 05:49:15 2014	(r271892)
+++ head/etc/rc.d/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
@@ -133,7 +133,6 @@ FILES=	DAEMON \
 	rpcbind \
 	rtadvd \
 	rtsold \
-	rwho \
 	savecore \
 	sdpd \
 	securelevel \
@@ -192,6 +191,10 @@ _opensm=	opensm
 _sshd=		sshd
 .endif
 
+.if ${MK_RCMDS} != "no"
+FILES+=		rwho
+.endif
+
 .if ${MK_UNBOUND} != "no"
 _unbound=	local_unbound
 .endif

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Sep 20 05:49:15 2014	(r271892)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Sep 20 06:05:24 2014	(r271893)
@@ -3766,6 +3766,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
+OLD_FILES+=etc/rc.d/rwho
 OLD_FILES+=etc/periodic/daily/140.clean-rwho 
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 OLD_FILES+=rescue/rcp