From owner-svn-src-all@FreeBSD.ORG  Sat Sep 20 06:05:25 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 092FC1E0;
 Sat, 20 Sep 2014 06:05:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E9225F88;
 Sat, 20 Sep 2014 06:05:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8K65ObK093397;
 Sat, 20 Sep 2014 06:05:24 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8K65Ot8093395;
 Sat, 20 Sep 2014 06:05:24 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409200605.s8K65Ot8093395@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 20 Sep 2014 06:05:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271893 - in head: etc/rc.d tools/build/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Sep 2014 06:05:25 -0000

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