svn commit: r278189 - in stable/9: etc/rc.d tools/build/mk

[Garrett Cooper]

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