diff options
| author | ngie <ngie@FreeBSD.org> | 2015-01-26 09:37:14 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-01-26 09:37:14 +0000 |
| commit | 3f28aaf80d91579ecd9e3c5e9d36719ef163810f (patch) | |
| tree | 8f132db2de3d0001208352e8c91b7fc998258939 | |
| parent | ce8bfdf2f6cb1be7f5547a4b56e7544f890c214e (diff) | |
| download | FreeBSD-src-3f28aaf80d91579ecd9e3c5e9d36719ef163810f.zip FreeBSD-src-3f28aaf80d91579ecd9e3c5e9d36719ef163810f.tar.gz | |
Honor MK_JAIL with etc/rc.d/jail
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index a013a6c..ee4b8d2 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index cccee3c..bafbaf7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2369,6 +2369,7 @@ OLD_FILES+=usr/share/man/man8/iscsid.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 |
