From owner-svn-src-all@FreeBSD.ORG  Wed Feb  4 09:23:41 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CA3434BB;
 Wed,  4 Feb 2015 09:23:41 +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 B57103E3;
 Wed,  4 Feb 2015 09:23:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t149Nfug024508;
 Wed, 4 Feb 2015 09:23:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t149Nf5q024504;
 Wed, 4 Feb 2015 09:23:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502040923.t149Nf5q024504@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: Wed, 4 Feb 2015 09:23:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r278189 - in stable/9: etc/rc.d tools/build/mk
X-SVN-Group: stable-9
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: Wed, 04 Feb 2015 09:23:41 -0000

Author: ngie
Date: Wed Feb  4 09:23:40 2015
New Revision: 278189
URL: https://svnweb.freebsd.org/changeset/base/278189

Log:
  MFC r277739:
  
  r277739:
  
    Honor MK_JAIL with etc/rc.d/jail
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/9/etc/rc.d/Makefile
  stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/9/   (props changed)
  stable/9/etc/   (props changed)
  stable/9/etc/rc.d/   (props changed)
  stable/9/tools/   (props changed)
  stable/9/tools/build/   (props changed)

Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile	Wed Feb  4 09:21:07 2015	(r278188)
+++ stable/9/etc/rc.d/Makefile	Wed Feb  4 09:23:40 2015	(r278189)
@@ -63,7 +63,6 @@ FILES=	DAEMON \
 	ipnat \
 	ipsec \
 	${_ipxrouted} \
-	jail \
 	kadmind \
 	kerberos \
 	keyserv \
@@ -162,6 +161,10 @@ FILES=	DAEMON \
 _ipxrouted=	ipxrouted
 .endif
 
+.if ${MK_JAIL} != "no"
+FILES+=		jail
+.endif
+
 .if ${MK_OFED} != "no"
 _opensm=	opensm
 .endif

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:21:07 2015	(r278188)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:23:40 2015	(r278189)
@@ -2236,6 +2236,7 @@ OLD_FILES+=usr/share/man/man8/IPXrouted.
 .endif
 
 .if ${MK_JAIL} == no
+OLD_FILES+=etc/rc.d/jail
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls