From 88537df7130470edc2bfdaf401ebc3f701b11884 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 4 Feb 2015 09:23:40 +0000 Subject: [PATCH] MFC r277739: r277739: Honor MK_JAIL with etc/rc.d/jail Sponsored by: EMC / Isilon Storage Division git-svn-id: svn://svn.freebsd.org/base/stable/9@278189 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/rc.d/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 2995fccef..fc33aacae 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4dee2a2e1..8b16dc9f4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2236,6 +2236,7 @@ OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz .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 -- 2.45.0