diff options
author | erdgeist <erdgeist@erdgeist.org> | 2013-04-10 23:11:58 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2013-04-10 23:11:58 +0000 |
commit | 92db4874abbc070e8d22d82ee2bae9162913e464 (patch) | |
tree | 1a95a1e5aecaa0a9222c4392f8d9f91a5abb78e3 | |
parent | 31feb69b9c64a66433d1fd0e28283ceef05b8978 (diff) |
Document the new ezjail-admin create -z feature. Also properly attribute the man page authors.
-rwxr-xr-x | man5/ezjail.conf.5 | 7 | ||||
-rw-r--r-- | man7/ezjail.7 | 7 | ||||
-rw-r--r-- | man8/ezjail-admin.8 | 30 |
3 files changed, 40 insertions, 4 deletions
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5 index 847eee4..19eb2a1 100755 --- a/man5/ezjail.conf.5 +++ b/man5/ezjail.conf.5 | |||
@@ -216,3 +216,10 @@ EZJAIL_PREFIX/etc/rc.d/ezjail.sh | |||
216 | .Sh AUTHOR | 216 | .Sh AUTHOR |
217 | Dirk Engling | 217 | Dirk Engling |
218 | .Aq erdgeist@erdgeist.org . | 218 | .Aq erdgeist@erdgeist.org . |
219 | .Pp | ||
220 | The man page is based on a draft by | ||
221 | .An JoeB | ||
222 | .Aq joeb1@a1poweruser.com | ||
223 | and was rewritten by | ||
224 | .An Frederic Perrin | ||
225 | .Aq frederic.perrin@resel.fr . \ No newline at end of file | ||
diff --git a/man7/ezjail.7 b/man7/ezjail.7 index dd89dca..a9f1056 100644 --- a/man7/ezjail.7 +++ b/man7/ezjail.7 | |||
@@ -656,3 +656,10 @@ Interesting additional tools include: | |||
656 | .Sh AUTHOR | 656 | .Sh AUTHOR |
657 | .An Dirk Engling | 657 | .An Dirk Engling |
658 | .Aq erdgeist@erdgeist.org . | 658 | .Aq erdgeist@erdgeist.org . |
659 | .Pp | ||
660 | The man page is based on a draft by | ||
661 | .An JoeB | ||
662 | .Aq joeb1@a1poweruser.com | ||
663 | and was rewritten by | ||
664 | .An Frederic Perrin | ||
665 | .Aq frederic.perrin@resel.fr . \ No newline at end of file | ||
diff --git a/man8/ezjail-admin.8 b/man8/ezjail-admin.8 index 727615b..5cda975 100644 --- a/man8/ezjail-admin.8 +++ b/man8/ezjail-admin.8 | |||
@@ -16,6 +16,7 @@ | |||
16 | .Op Fl r Ar jailroot | 16 | .Op Fl r Ar jailroot |
17 | .Op Fl a Ar archive | 17 | .Op Fl a Ar archive |
18 | .Op Fl c Ar jailtype Fl s Ar imagesize Op Fl C Ar attachargs | 18 | .Op Fl c Ar jailtype Fl s Ar imagesize Op Fl C Ar attachargs |
19 | .Op Fl z Ar parentzfs | ||
19 | .Bk -words | 20 | .Bk -words |
20 | .Ar jailname ipaddress Ns Op Ar ,ipaddress2,... | 21 | .Ar jailname ipaddress Ns Op Ar ,ipaddress2,... |
21 | .Ek | 22 | .Ek |
@@ -276,20 +277,34 @@ jail is backed with a | |||
276 | .Xr zfs 8 | 277 | .Xr zfs 8 |
277 | filesystem, whose initial quota is given with the | 278 | filesystem, whose initial quota is given with the |
278 | .Fl s | 279 | .Fl s |
279 | option. The filesystem is created in the | 280 | option. The filesystem by default |
281 | (see the | ||
282 | .Fl z | ||
283 | option) is created in the | ||
280 | .Dq Li $ezjail_jailzfs | 284 | .Dq Li $ezjail_jailzfs |
281 | parent filesystem and by default compressed using the lzjb method, as set in | 285 | parent filesystem and compressed using the lzjb method, as set in |
282 | the | 286 | the |
283 | .Dq Li ezjail_zfs_jail_properies | 287 | .Dq Li ezjail_zfs_jail_properies |
284 | variable, both values configured in | 288 | variable, both values configured in |
285 | .Xr ezjail.conf 5 | 289 | .Xr ezjail.conf 5 . |
286 | .Pp | 290 | .Pp |
287 | In each case, the | 291 | In each case, the |
288 | .Fl s | 292 | .Fl s |
289 | flag is mandatory when creating such a jail. An empty directory (without the | 293 | flag is mandatory when creating a file backed jail (i.e. any image that is |
294 | not zfs backed). An empty directory (without the | ||
290 | .Pa .img | 295 | .Pa .img |
291 | suffix in the case of file-based jails) will be created and used as a mount | 296 | suffix in the case of file-based jails) will be created and used as a mount |
292 | point when running the jail. | 297 | point when running the jail. |
298 | .It Fl z Ar parentzfs | ||
299 | Normally zfs jails are created in a child of the same zfs, ezjail keeps its | ||
300 | working directories in, as configured in the | ||
301 | .Dq Li ezjail_jailzfs | ||
302 | variable set in | ||
303 | .Xr ezjail.conf 5 . | ||
304 | Use this option to override this default. | ||
305 | .Pp | ||
306 | This option implies | ||
307 | .Fl c Ar zfs . | ||
293 | .It Fl s Ar imagesize | 308 | .It Fl s Ar imagesize |
294 | Allocate this size to the jail. Without an unit, the size is in bytes. The | 309 | Allocate this size to the jail. Without an unit, the size is in bytes. The |
295 | valid suffix values are b/B for blocks (i. e. 512 bytes), k/K for kilobytes, | 310 | valid suffix values are b/B for blocks (i. e. 512 bytes), k/K for kilobytes, |
@@ -605,3 +620,10 @@ filesystem is taken first. | |||
605 | .Sh AUTHOR | 620 | .Sh AUTHOR |
606 | .An Dirk Engling | 621 | .An Dirk Engling |
607 | .Aq erdgeist@erdgeist.org . | 622 | .Aq erdgeist@erdgeist.org . |
623 | .Pp | ||
624 | The man page is based on a draft by | ||
625 | .An JoeB | ||
626 | .Aq joeb1@a1poweruser.com | ||
627 | and was rewritten by | ||
628 | .An Frederic Perrin | ||
629 | .Aq frederic.perrin@resel.fr . \ No newline at end of file | ||