summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAntranig Vartanian <antranigv@freebsd.am>2021-09-08 07:07:49 +0000
committerKyle Evans <kevans@FreeBSD.org>2022-03-09 21:21:49 +0000
commit065edb739e151d4058448414c545f76d8cdc9a9c (patch)
treecc366aaef4fb5f80a838034808d7eeb82ce29edf /share
parente14f57ffa6c9d628b191af0c2b5425c223f47ef3 (diff)
Add support for jail.conf.d
Using /etc/jail.{jailname}.conf is nice, however it makes /etc/ very messy if you have many jails. This patch allows one to move these config files out of the way into /etc/jail.conf.d/{jailname}.conf. Note that the same caveat as /etc/jail.*.conf applies: the jail service will not autodiscover all of these for starting 'all' jails. This is considered future work, since the behavior matches. (cherry picked from commit 7955efd574b98601a95da45d6d8e7f452631fddd)
Diffstat (limited to 'share')
-rw-r--r--share/man/man5/rc.conf.59
1 files changed, 8 insertions, 1 deletions
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index fad969b008d8..ff9123163a1e 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 3, 2022
+.Dd March 9, 2022
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3899,6 +3899,13 @@ The configuration filename used by
utility.
The default value is
.Pa /etc/jail.conf .
+.Pa /etc/jail. Ns Ao Ar jname Ac Ns Va .conf
+and
+.Pa /etc/jail.conf.d/ Ns Ao Ar jname Ac Ns Va .conf
+will also be used if
+.Va Ao Ar jname Ac Va
+is set in
+.Va jail_list .
.It Va jail_parallel_start
.Pq Vt bool
If set to