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

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 09:37:14 2015
New Revision: 277739
URL: https://svnweb.freebsd.org/changeset/base/277739

Log:
  Honor MK_JAIL with etc/rc.d/jail
  
  MFC after: 1 week
  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	Mon Jan 26 09:31:48 2015	(r277738)
+++ head/etc/rc.d/Makefile	Mon Jan 26 09:37:14 2015	(r277739)
@@ -57,7 +57,6 @@ FILES=	DAEMON \
 	ipropd_master \
 	ipropd_slave \
 	ipsec \
-	jail \
 	${_kadmind} \
 	${_kdc} \
 	${_kfd} \
@@ -201,6 +200,10 @@ FILES+=		iscsictl
 FILES+=		iscsid
 .endif
 
+.if ${MK_JAIL} != "no"
+FILES+=	jail
+.endif
+
 .if ${MK_LPR} != "no"
 FILES+=		lpd
 .endif

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:31:48 2015	(r277738)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:37:14 2015	(r277739)
@@ -2369,6 +2369,7 @@ OLD_FILES+=usr/share/man/man8/iscsid.8.g
 .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