summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2016-04-30 21:27:41 +0000
committerjamie <jamie@FreeBSD.org>2016-04-30 21:27:41 +0000
commitcfbfb8c55183213ef78b9d70dc5e394508617ec6 (patch)
tree0ae27f10bfb83b7948f80ae1d947e1b9dec2a8f2
parent44fbeec2fc42b07c2ef06b97e3e9803f8381adf2 (diff)
downloadFreeBSD-src-cfbfb8c55183213ef78b9d70dc5e394508617ec6.zip
FreeBSD-src-cfbfb8c55183213ef78b9d70dc5e394508617ec6.tar.gz
Clarify when happens when there is a "depend" parameter in jail.conf,
and how this affects the "jail_list" option in rc.conf.
-rw-r--r--share/man/man5/rc.conf.55
-rw-r--r--usr.sbin/jail/jail.89
2 files changed, 9 insertions, 5 deletions
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 9d393b0..ae4972e 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 29, 2016
+.Dd April 30, 2016
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3868,6 +3868,9 @@ The names specified in this list control the jail startup order.
instances missing from
.Va jail_list
must be started manually.
+Note that a jail's
+.Va depend
+parameter in the configuration file may override this list.
.It Va jail_reverse_stop
.Pq Vt bool
When set to
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 6dd8c7f..9c32832 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 25, 2016
+.Dd April 30, 2016
.Dt JAIL 8
.Os
.Sh NAME
@@ -838,13 +838,14 @@ Allow making changes to a
jail.
.It Va depend
Specify a jail (or jails) that this jail depends on.
-Any such jails must be fully created, up to the last
+When this jail is to be created, any jail(s) it depends on must already exist.
+If not, they will be created automatically, up to the completion of the last
.Va exec.poststart
command, before any action will taken to create this jail.
When jails are removed the opposite is true:
-this jail must be fully removed, up to the last
+this jail will be removed, up to the last
.Va exec.poststop
-command, before the jail(s) it depends on are stopped.
+command, before any jail(s) it depends on are stopped.
.El
.Sh EXAMPLES
Jails are typically set up using one of two philosophies: either to
OpenPOWER on IntegriCloud