diff options
author | Dirk Engling <erdgeist@erdgeist.org> | 2013-12-07 03:18:16 +0100 |
---|---|---|
committer | Dirk Engling <erdgeist@erdgeist.org> | 2013-12-07 03:18:16 +0100 |
commit | 8798063e84884f3263f9b7abd9913308b7950063 (patch) | |
tree | 9513635d38e40f27c89f157ef9311bb2e0e4ccc7 | |
parent | c95e27fc2f3847f6f80d74c55f268235ab1c9fcc (diff) |
Lots of spelling fixes in comments and man pages submitted by Paul Ivanov
-rwxr-xr-x | ezjail-admin | 2 | ||||
-rwxr-xr-x | ezjail.sh | 2 | ||||
-rwxr-xr-x | man5/ezjail.conf.5 | 8 | ||||
-rw-r--r-- | man7/ezjail.7 | 14 | ||||
-rw-r--r-- | man8/ezjail-admin.8 | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/ezjail-admin b/ezjail-admin index 8330d01..f8bb9a7 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -434,7 +434,7 @@ ensure_jailzfs() { | |||
434 | _zfs_status=`/sbin/zfs list -H -o name ${ezjail_jailzfs} 2> /dev/null` | 434 | _zfs_status=`/sbin/zfs list -H -o name ${ezjail_jailzfs} 2> /dev/null` |
435 | [ "${_zfs_status}" = "${ezjail_jailzfs}" ] && return | 435 | [ "${_zfs_status}" = "${ezjail_jailzfs}" ] && return |
436 | 436 | ||
437 | # if a directoy already exists in that place, make sure it is empty, else bump user | 437 | # if a directory already exists in that place, make sure it is empty, else bump user |
438 | [ -d "${ezjail_jaildir}" -a -n "`ls -A ${ezjail_jaildir}`" ] && exerr "Error: Can not create zfs at ${ezjail_jaildir}.\n There is a non-empty directory in the way." | 438 | [ -d "${ezjail_jaildir}" -a -n "`ls -A ${ezjail_jaildir}`" ] && exerr "Error: Can not create zfs at ${ezjail_jaildir}.\n There is a non-empty directory in the way." |
439 | 439 | ||
440 | # create all parent file systems if necessary | 440 | # create all parent file systems if necessary |
@@ -89,7 +89,7 @@ do_cmd() | |||
89 | # Cannot auto mount blocking jails without interrupting boot process | 89 | # Cannot auto mount blocking jails without interrupting boot process |
90 | [ "${ezjail_fromrc}" -a "${action}" = "start" -a "${ezjail_blocking}" ] && echo -n " ...skipping blocking jail ${ezjail}" && continue | 90 | [ "${ezjail_fromrc}" -a "${action}" = "start" -a "${ezjail_blocking}" ] && echo -n " ...skipping blocking jail ${ezjail}" && continue |
91 | 91 | ||
92 | # Explicitely do only run blocking crypto jails when *crypto is requested | 92 | # Explicitly do only run blocking crypto jails when *crypto is requested |
93 | [ "${action%crypto}" = "${action}" -o "${ezjail_blocking}" ] || continue | 93 | [ "${action%crypto}" = "${action}" -o "${ezjail_blocking}" ] || continue |
94 | 94 | ||
95 | # Try to attach (crypto) devices | 95 | # Try to attach (crypto) devices |
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5 index 806e760..a86db07 100755 --- a/man5/ezjail.conf.5 +++ b/man5/ezjail.conf.5 | |||
@@ -1,4 +1,4 @@ | |||
1 | .Dd January 15, 2011 | 1 | .Dd December 5, 2013 |
2 | .Dt EZJAIL.CONF 5 USD | 2 | .Dt EZJAIL.CONF 5 USD |
3 | .Os FreeBSD | 3 | .Os FreeBSD |
4 | .Sh NAME | 4 | .Sh NAME |
@@ -157,7 +157,7 @@ Default: | |||
157 | .It ezjail_imagetype (one of simple, bde, eli, zfs) | 157 | .It ezjail_imagetype (one of simple, bde, eli, zfs) |
158 | Type of jail to create when creating a jail with the | 158 | Type of jail to create when creating a jail with the |
159 | .Fl i | 159 | .Fl i |
160 | flag without specifying the type explicitely. | 160 | flag without specifying the type explicitly. |
161 | .br | 161 | .br |
162 | Default: | 162 | Default: |
163 | .Em simple | 163 | .Em simple |
@@ -165,7 +165,7 @@ Default: | |||
165 | .Sh ZFS OPTIONS | 165 | .Sh ZFS OPTIONS |
166 | .Bl -tag -width option | 166 | .Bl -tag -width option |
167 | .It ezjail_use_zfs (bool) | 167 | .It ezjail_use_zfs (bool) |
168 | Set to YES, if ezjail should manage basejail and newjail in a seperate | 168 | Set to YES, if ezjail should manage basejail and newjail in a separate |
169 | ZFS-datasets. | 169 | ZFS-datasets. |
170 | .br | 170 | .br |
171 | Default: | 171 | Default: |
@@ -184,7 +184,7 @@ Default: | |||
184 | The name of the parent ZFS-dataset which ezjail will use to create | 184 | The name of the parent ZFS-dataset which ezjail will use to create |
185 | jails on. It will be mounted in | 185 | jails on. It will be mounted in |
186 | .Em ezjail_jaildir . | 186 | .Em ezjail_jaildir . |
187 | Setting this will automaticly enable ezjail managing jails in seperate | 187 | Setting this will automatically enable ezjail managing jails in separate |
188 | ZFS-datasets. | 188 | ZFS-datasets. |
189 | .br | 189 | .br |
190 | Default: | 190 | Default: |
diff --git a/man7/ezjail.7 b/man7/ezjail.7 index d30fb2e..83a920b 100644 --- a/man7/ezjail.7 +++ b/man7/ezjail.7 | |||
@@ -1,4 +1,4 @@ | |||
1 | .Dd January 15, 2011 | 1 | .Dd December 5, 2013 |
2 | .Dt EZJAIL 7 USD | 2 | .Dt EZJAIL 7 USD |
3 | .Os | 3 | .Os |
4 | .Sh NAME | 4 | .Sh NAME |
@@ -145,7 +145,7 @@ filesystem. See | |||
145 | .Sx Jail Creation Examples | 145 | .Sx Jail Creation Examples |
146 | for details. | 146 | for details. |
147 | .Pp | 147 | .Pp |
148 | Also, ezjail can be configured to install its basejail and the accompaning | 148 | Also, ezjail can be configured to install its basejail and the accompanying |
149 | template for all new jails into its own filesystem. Set the | 149 | template for all new jails into its own filesystem. Set the |
150 | .Dq Li $ezjail_use_zfs | 150 | .Dq Li $ezjail_use_zfs |
151 | variable in your | 151 | variable in your |
@@ -348,7 +348,7 @@ configuration, creating classes of jails for development or testing | |||
348 | favourite web development framework), pre-creating local users, and so | 348 | favourite web development framework), pre-creating local users, and so |
349 | on. | 349 | on. |
350 | .Ss Updating the Base Jail | 350 | .Ss Updating the Base Jail |
351 | We already mentionned how easy it is to update jails, since only one | 351 | We already mentioned how easy it is to update jails, since only one |
352 | copy needs to be updated. Ezjail only handles updating the base | 352 | copy needs to be updated. Ezjail only handles updating the base |
353 | system; updating the ports is left to the administrator (but see | 353 | system; updating the ports is left to the administrator (but see |
354 | .Dq Li ports-mgmt/jailaudit | 354 | .Dq Li ports-mgmt/jailaudit |
@@ -361,7 +361,7 @@ binary packages. If a base jail already exists, the | |||
361 | command installs the world in a temporary directory before moving it | 361 | command installs the world in a temporary directory before moving it |
362 | to the basejail, thus leaving intact all installed libraries. After | 362 | to the basejail, thus leaving intact all installed libraries. After |
363 | making sure all software running in the jails is linked with the new | 363 | making sure all software running in the jails is linked with the new |
364 | librairies, you may want to remove the old library versions. It is | 364 | libraries, you may want to remove the old library versions. It is |
365 | often a good idea to update the jails when a new kernel is installed | 365 | often a good idea to update the jails when a new kernel is installed |
366 | in the host, using the same sources. | 366 | in the host, using the same sources. |
367 | .Ss Starting Jails | 367 | .Ss Starting Jails |
@@ -433,7 +433,7 @@ knobs for allowing a jail to access raw sockets, see the | |||
433 | man page for details. | 433 | man page for details. |
434 | .Pp | 434 | .Pp |
435 | Once your jail has network access, then all your normal application | 435 | Once your jail has network access, then all your normal application |
436 | install functions are availabe, right from the jails console. In | 436 | install functions are available, right from the jails console. In |
437 | particular, if the ports collection was installed, it can be used as | 437 | particular, if the ports collection was installed, it can be used as |
438 | if from the host system. A modified | 438 | if from the host system. A modified |
439 | .Pa make.conf | 439 | .Pa make.conf |
@@ -458,7 +458,7 @@ in | |||
458 | .Pa rc.conf . | 458 | .Pa rc.conf . |
459 | It is possible to set this variable to | 459 | It is possible to set this variable to |
460 | .Dq Li NO | 460 | .Dq Li NO |
461 | if the administrator wants to temporarily ezjail, or if she doesn't | 461 | if the administrator wants to temporarily disable ezjail, or if she doesn't |
462 | want the jails to be automatically started on boot. | 462 | want the jails to be automatically started on boot. |
463 | .Pp | 463 | .Pp |
464 | The ezjail system may be reset to a pristine state by removing all its | 464 | The ezjail system may be reset to a pristine state by removing all its |
@@ -618,7 +618,7 @@ Create a new jail, placing it in directory | |||
618 | instead of deriving the directory name of the jail from its host name. | 618 | instead of deriving the directory name of the jail from its host name. |
619 | The jail will be created with the flavour | 619 | The jail will be created with the flavour |
620 | .Ar example . | 620 | .Ar example . |
621 | This jail will be given two IP addressses; this is possible only since | 621 | This jail will be given two IP addresses; this is possible only since |
622 | FreeBSD 7.2. | 622 | FreeBSD 7.2. |
623 | .It Nm Cm create Fl i Fl s Ar 600M sandbox2 10.0.10.4 | 623 | .It Nm Cm create Fl i Fl s Ar 600M sandbox2 10.0.10.4 |
624 | This creates a new file-based jail having a file size of 600 megabytes | 624 | This creates a new file-based jail having a file size of 600 megabytes |
diff --git a/man8/ezjail-admin.8 b/man8/ezjail-admin.8 index 72ef892..8382e44 100644 --- a/man8/ezjail-admin.8 +++ b/man8/ezjail-admin.8 | |||
@@ -1,4 +1,4 @@ | |||
1 | .Dd August 01, 2013 | 1 | .Dd December 5, 2013 |
2 | .Dt EZJAIL-ADMIN 8 USD | 2 | .Dt EZJAIL-ADMIN 8 USD |
3 | .Os FreeBSD | 3 | .Os FreeBSD |
4 | .Sh NAME | 4 | .Sh NAME |
@@ -129,7 +129,7 @@ is used. Variable: | |||
129 | .Pp | 129 | .Pp |
130 | It is possible to install from the | 130 | It is possible to install from the |
131 | .Li disc1 | 131 | .Li disc1 |
132 | CDRom, or an extracted -RELEASE directory, by specifying the | 132 | CD-ROM, or an extracted -RELEASE directory, by specifying the |
133 | .Ar host | 133 | .Ar host |
134 | argument as | 134 | argument as |
135 | .Pa file://path/to/source . | 135 | .Pa file://path/to/source . |
@@ -351,7 +351,7 @@ Use | |||
351 | .Ar command | 351 | .Ar command |
352 | instead of the default | 352 | instead of the default |
353 | .Dq /usr/bin/login -f root . | 353 | .Dq /usr/bin/login -f root . |
354 | loogin command. A one time change to use a different user can be | 354 | login command. A one time change to use a different user can be |
355 | accomplished by using | 355 | accomplished by using |
356 | .Fl e Qq Li /usr/bin/login -f user . | 356 | .Fl e Qq Li /usr/bin/login -f user . |
357 | Variable: | 357 | Variable: |
@@ -562,7 +562,7 @@ you may pass freebsd-update's call to | |||
562 | .Dq uname -r | 562 | .Dq uname -r |
563 | via the | 563 | via the |
564 | .Pa UNAME_r | 564 | .Pa UNAME_r |
565 | environment variable. Since there currently is no way of infering the | 565 | environment variable. Since there currently is no way of inferring the |
566 | osversion currently installed in the basejail, you need to remember the | 566 | osversion currently installed in the basejail, you need to remember the |
567 | original osversion and pass it to this script using the | 567 | original osversion and pass it to this script using the |
568 | .Fl s | 568 | .Fl s |