diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-04 09:10:46 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-04 09:10:46 +0000 |
| commit | 50ffbe800bc375cb06b3343631d5013b624ada4b (patch) | |
| tree | d67bf5d3f777b599bdb0dbb44b15cb8ff267d649 | |
| parent | 250dcf712f2a948b0c808f09db966d3746c520f0 (diff) | |
| download | FreeBSD-src-50ffbe800bc375cb06b3343631d5013b624ada4b.zip FreeBSD-src-50ffbe800bc375cb06b3343631d5013b624ada4b.tar.gz | |
MFC r277739:
r277739:
Honor MK_JAIL with etc/rc.d/jail
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 434896b..ef66965 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 05da4a3..41aaeee 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2143,6 +2143,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 |
