Update the manpages to reflect the current state of options.

2 files changed, 29 insertions, 2 deletions

diff --git a/man1/ezjail-admin.1 b/man1/ezjail-admin.1
index 6d59a45..84ecd12 100755
--- a/man1/ezjail-admin.1
+++ b/man1/ezjail-admin.1
@@ -16,7 +16,7 @@ ezjail-admin \- Administrate ezjail
 .B ezjail-admin list
 
 .T
-.B ezjail-admin config\fR [-r run|norun] [-n newname] [-i attach|detach|fsck]\fI jailname
+.B ezjail-admin config\fR [-r run|norun] [-n newname] [-c cpu-list] [-z zfs-dataset] [-f fib-number] [-i attach|detach|fsck]\fI jailname
 
 .T
 .B ezjail-admin delete \fR[-w] \fI hostname
@@ -144,6 +144,17 @@ You can rename an ezjail by using the -n newname option. If the specified
 ezjail is an image jail and the image has its default name, the image is
 renamed as well.
 
+You can configure a cpuset(1) for the jail to use with the -c option. The setting
+will be configured and, if the jail is running, appliedto the running jail. The specification
+may include numbers separated by '-' for ranges and commas separating individual numbers.
+
+With the -z option, one or more zfs-datasets can be configured to be attached to the jail.
+You need to configure the sysctl security.jail.mount_allowed=1 and security.jail.enforce_statfs=0
+as well as "add path zfs unhide" in the devfs ruleset for the jail.
+
+You can configure an altered network view (FIB) for the jail with the -f option. For setting up FIBs, see
+setfib(1). The jail needs to be restarted after the option has been applied to take effect.
+
 You can attach image jails for administrative purposes with the -i attach
 option, and detach them with -i detach. It is not possible to run or delete
 an attached jail. You can force fscking a jail image with the -i fsck command.
@@ -249,6 +260,6 @@ EZJAIL_PREFIX/etc/rc.d/ezjail.sh
 .br
 EZJAIL_PREFIX/share/examples/ezjail/
 .SH "SEE ALSO"
-ezjail(5), ezjail.conf(5), jail(8), devfs(5), fdescfs(5), procfs(5), pw(8)
+ezjail(5), ezjail.conf(5), jail(8), devfs(5), fdescfs(5), procfs(5), pw(8), cpuset(1), setfib(1)
 .SH AUTHOR
 Dirk Engling <erdgeist@erdgeist.org>
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5
index 9089b86..259d4ee 100755
--- a/man5/ezjail.conf.5
+++ b/man5/ezjail.conf.5
@@ -112,6 +112,22 @@ for more information).
 Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail.
 .br
 .I default: YES
+.SH ZFS OPTIONS
+.TP
+.B ezjail_use_zfs (bool)
+Set to YES, if ezjail should manage basejail and newjail in a seperate ZFS-datasets.
+.br
+.I default: NO
+.TP
+.B ezjail_jailzfs (str)
+The name of the parent ZFS-dataset which ezjail will use to create jails on. It will be mounted at the ezjail_jaildir. Setting this will automaticly enable ezjail managing jails in seperate ZFS-datasets.
+.br
+.I default: none
+.TP
+.B ezjail_zfs_properties (str)
+Default properties ZFS will use for creating datasets. See zfs(1m) for details. ADVANCED, be very careful!
+.br
+.I default: none
 .SH FILES
 EZJAIL_PREFIX/etc/ezjail.conf
 .br