summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2010-02-08 05:15:20 +0000
committererdgeist <erdgeist@erdgeist.org>2010-02-08 05:15:20 +0000
commit99c0ffc6132b6b03b0d6058f5df3a8cccfe2d81b (patch)
tree9f7dff03ec06c45b4d314f825283cd623e1d68f2
parentbd9c44955201b34fa55d2d9821b2031fca0433ba (diff)
Explain default and multiple flavours
-rwxr-xr-xman1/ezjail-admin.119
-rwxr-xr-xman5/ezjail.conf.52
2 files changed, 12 insertions, 9 deletions
diff --git a/man1/ezjail-admin.1 b/man1/ezjail-admin.1
index 864e2c0..18cea26 100755
--- a/man1/ezjail-admin.1
+++ b/man1/ezjail-admin.1
@@ -7,7 +7,7 @@ ezjail-admin \- Administrate ezjail
7 7
8.T 8.T
9.B ezjail-admin create 9.B ezjail-admin create
10[-f flavour] [-r jailroot] [-s imagesize] [-ibx] [-c bde|eli|zfs] [-C attachargs] [-a archive]\fI hostname jailip 10[-f flavours] [-r jailroot] [-s imagesize] [-ibx] [-c bde|eli|zfs] [-C attachargs] [-a archive]\fI hostname jailip
11 11
12.T 12.T
13.B ezjail-admin console\fR [-f] [-e command]\fI jailname 13.B ezjail-admin console\fR [-f] [-e command]\fI jailname
@@ -108,10 +108,13 @@ This is useful in situations where you just want to alter some of a
108jail's properties and called ezjail-admin delete without the -w option 108jail's properties and called ezjail-admin delete without the -w option
109before. However, sanity checks are performed. 109before. However, sanity checks are performed.
110 110
111Using the -f \fIflavour\fR option you can apply an ezjail \fBFLAVOUR\fR 111Using the -f \fIflavour\fR option you can specify one or multiple space
112to your ezjail (e.g. preinstall packages, add users, configure rc). 112separated ezjail \fBFLAVOUR\fRs to be installed in your ezjail (e.g.
113\fIflavour\fR is a directory tree under ezjail's root dir (default: 113preinstall packages, add users, configure rc). \fIflavours\fR points to
114\fI/usr/jails/flavours\fR). See \fBFLAVOURS\fR below for more details. 114one or more directory trees under ezjail's root dir (default:
115\fI/usr/jails/flavours\fR). If no flavours are passed, the global
116ezjail_default_flavour (default: \fI""\fR) is used. See \fBFLAVOURS\fR below
117for more details.
115 118
116Options for newly created jails are read from \fBezjail.conf\fR; refer to 119Options for newly created jails are read from \fBezjail.conf\fR; refer to
117ezjail.conf(5) for more information. 120ezjail.conf(5) for more information.
@@ -226,9 +229,9 @@ A sample flavour config directory resides under
226initialization actions are demonstrated, and you are encouraged to use it as 229initialization actions are demonstrated, and you are encouraged to use it as
227a template for your flavours. 230a template for your flavours.
228 231
229If a flavour is selected on jail creation, the flavour root is 232If flavours are selected on jail creation, their root directories are
230copied to the new jail's root, mostly containing an \fI/ezjail.flavour\fR. 233copied to the new jail's root, each containing an \fI/ezjail.flavour\fR.
231When the jail starts up for the first time, this script is run and deleted. 234When the jail starts up for the first time, these scripts are run and deleted.
232 235
233In its default form it will create some groups and users, change the 236In its default form it will create some groups and users, change the
234ownership of some files and install all packages residing under /pkg. 237ownership of some files and install all packages residing under /pkg.
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5
index 36b27c4..81ac1ba 100755
--- a/man5/ezjail.conf.5
+++ b/man5/ezjail.conf.5
@@ -114,7 +114,7 @@ Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/loca
114.I default: YES 114.I default: YES
115.TP 115.TP
116.B ezjail_default_flavour (str) 116.B ezjail_default_flavour (str)
117Controls which flavour should be used for newly created jails. 117Controls which flavours should be used for newly created jails if none are given on the command line.
118.br 118.br
119.I default: none 119.I default: none
120.SH ZFS OPTIONS 120.SH ZFS OPTIONS