summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcryx <cryx@h3q.com>2010-01-08 22:08:26 +0000
committercryx <cryx@h3q.com>2010-01-08 22:08:26 +0000
commita7c0da9712861c7653937c16c272c64a35c95c91 (patch)
tree32ef2643335ca10787bdb4673d8883e2b2f1d7d2
parent055caedade786a41963412ec1956944aded18b33 (diff)
Update the manpages to reflect the current state of options.
-rwxr-xr-xman1/ezjail-admin.115
-rwxr-xr-xman5/ezjail.conf.516
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
16.B ezjail-admin list 16.B ezjail-admin list
17 17
18.T 18.T
19.B ezjail-admin config\fR [-r run|norun] [-n newname] [-i attach|detach|fsck]\fI jailname 19.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
20 20
21.T 21.T
22.B ezjail-admin delete \fR[-w] \fI hostname 22.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
144ezjail is an image jail and the image has its default name, the image is 144ezjail is an image jail and the image has its default name, the image is
145renamed as well. 145renamed as well.
146 146
147You can configure a cpuset(1) for the jail to use with the -c option. The setting
148will be configured and, if the jail is running, appliedto the running jail. The specification
149may include numbers separated by '-' for ranges and commas separating individual numbers.
150
151With the -z option, one or more zfs-datasets can be configured to be attached to the jail.
152You need to configure the sysctl security.jail.mount_allowed=1 and security.jail.enforce_statfs=0
153as well as "add path zfs unhide" in the devfs ruleset for the jail.
154
155You can configure an altered network view (FIB) for the jail with the -f option. For setting up FIBs, see
156setfib(1). The jail needs to be restarted after the option has been applied to take effect.
157
147You can attach image jails for administrative purposes with the -i attach 158You can attach image jails for administrative purposes with the -i attach
148option, and detach them with -i detach. It is not possible to run or delete 159option, and detach them with -i detach. It is not possible to run or delete
149an attached jail. You can force fscking a jail image with the -i fsck command. 160an 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
249.br 260.br
250EZJAIL_PREFIX/share/examples/ezjail/ 261EZJAIL_PREFIX/share/examples/ezjail/
251.SH "SEE ALSO" 262.SH "SEE ALSO"
252ezjail(5), ezjail.conf(5), jail(8), devfs(5), fdescfs(5), procfs(5), pw(8) 263ezjail(5), ezjail.conf(5), jail(8), devfs(5), fdescfs(5), procfs(5), pw(8), cpuset(1), setfib(1)
253.SH AUTHOR 264.SH AUTHOR
254Dirk Engling <erdgeist@erdgeist.org> 265Dirk 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).
112Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail. 112Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail.
113.br 113.br
114.I default: YES 114.I default: YES
115.SH ZFS OPTIONS
116.TP
117.B ezjail_use_zfs (bool)
118Set to YES, if ezjail should manage basejail and newjail in a seperate ZFS-datasets.
119.br
120.I default: NO
121.TP
122.B ezjail_jailzfs (str)
123The 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.
124.br
125.I default: none
126.TP
127.B ezjail_zfs_properties (str)
128Default properties ZFS will use for creating datasets. See zfs(1m) for details. ADVANCED, be very careful!
129.br
130.I default: none
115.SH FILES 131.SH FILES
116EZJAIL_PREFIX/etc/ezjail.conf 132EZJAIL_PREFIX/etc/ezjail.conf
117.br 133.br