svn commit: r278185 - in stable/10: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Wed Feb  4 09:10:46 2015
New Revision: 278185
URL: https://svnweb.freebsd.org/changeset/base/278185

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

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

Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Wed Feb  4 08:33:04 2015	(r278184)
+++ stable/10/etc/rc.d/Makefile	Wed Feb  4 09:10:46 2015	(r278185)
@@ -69,7 +69,6 @@ FILES=	DAEMON \
 	${_ipxrouted} \
 	iscsictl \
 	iscsid \
-	jail \
 	${_kadmind} \
 	${_kdc} \
 	keyserv \
@@ -183,6 +182,10 @@ FILES+=		bsnmpd
 _ipxrouted=	ipxrouted
 .endif
 
+.if ${MK_JAIL} != "no"
+FILES+=		jail
+.endif
+
 .if ${MK_KERBEROS} != "no"
 _kadmind=	kadmind
 _kdc=		kdc

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 08:33:04 2015	(r278184)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:10:46 2015	(r278185)
@@ -2143,6 +2143,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