diff options
author | erdgeist <erdgeist@erdgeist.org> | 2005-10-14 16:22:05 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2005-10-14 16:22:05 +0000 |
commit | 709e87e5dc2b124287a96d10ad70d955574ad99e (patch) | |
tree | c4659d5f10572672290a72d7a49a3803c9fbac14 | |
parent | 75b1c0589489b2c4418239f71c4798f9150ee77d (diff) |
Last cleanups before committingRELEASE_1_0
-rwxr-xr-x | ezjail.conf.sample | 4 | ||||
-rwxr-xr-x | ezjail.sh | 6 | ||||
-rwxr-xr-x | man1/ezjail-admin.1 | 13 | ||||
-rwxr-xr-x | man5/ezjail.5 | 1 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ezjail.conf.sample b/ezjail.conf.sample index 9a2cc64..5c5e589 100755 --- a/ezjail.conf.sample +++ b/ezjail.conf.sample | |||
@@ -1,7 +1,7 @@ | |||
1 | # ezjail.conf - Example file, see ezjail(x) | 1 | # ezjail.conf - Example file, see ezjail.conf(5) |
2 | # | 2 | # |
3 | # Note: If you alter some of those variables AFTER creating your first | 3 | # Note: If you alter some of those variables AFTER creating your first |
4 | # jail, you may have to adapt /etc/fstab.* and ${PREFIX}/etc/ezjail/* by | 4 | # jail, you may have to adapt /etc/fstab.* and EZJAIL_PREFIX/etc/ezjail/* by |
5 | # hand | 5 | # hand |
6 | 6 | ||
7 | # Location of jail root directories | 7 | # Location of jail root directories |
@@ -4,13 +4,13 @@ | |||
4 | # | 4 | # |
5 | # PROVIDE: ezjail | 5 | # PROVIDE: ezjail |
6 | # | 6 | # |
7 | # Note: Add the following lines to $PREFIX/etc/rc.conf to enable ezjail, | 7 | # Note: Add the following lines to /etc/rc.conf to enable ezjail, |
8 | # | 8 | # |
9 | #ezjail_enable="YES" | 9 | #ezjail_enable="YES" |
10 | # | 10 | # |
11 | # Please do not change this file, configure in $PREFIX/etc/ezjail.conf | 11 | # Please do not change this file, configure in EZJAIL_PREFIX/etc/ezjail.conf |
12 | 12 | ||
13 | # ugly: this variable will be set on port install time | 13 | # ugly: this variable is set on port install time |
14 | ezjail_prefix=EZJAIL_PREFIX | 14 | ezjail_prefix=EZJAIL_PREFIX |
15 | 15 | ||
16 | . /etc/rc.subr | 16 | . /etc/rc.subr |
diff --git a/man1/ezjail-admin.1 b/man1/ezjail-admin.1 index 56cd15c..8e42e46 100755 --- a/man1/ezjail-admin.1 +++ b/man1/ezjail-admin.1 | |||
@@ -38,23 +38,24 @@ in situations where you just want to alter some of a jail properties and | |||
38 | called ezjail-admin delete without the -w option before. However, sanity | 38 | called ezjail-admin delete without the -w option before. However, sanity |
39 | checks are being performed. | 39 | checks are being performed. |
40 | 40 | ||
41 | It then creates an entry in its /etc/ezjail directory allowing the | 41 | It then creates an entry in its etc/ezjail/ resource directory allowing |
42 | jail to be brought up after next reboot. | 42 | the jail to be brought up after next reboot. |
43 | 43 | ||
44 | If the ezjail_mount_enable option is set, a /etc/fstab.hostname is | 44 | If the ezjail_mount_enable option is set, a /etc/fstab.hostname is |
45 | generated, allowing the basejail to be auto-mounted when the jail starts | 45 | generated, allowing the basejail to be auto-mounted when the jail starts |
46 | up. | 46 | up. |
47 | 47 | ||
48 | Options for newly created jails are read from ezjail.conf, refer to | 48 | Options for newly created jails are read from |
49 | ezjail.conf(5) for more information. | 49 | .B ezjail.conf, |
50 | refer to ezjail.conf(5) for more information. | ||
50 | .SH ezjail-admin delete | 51 | .SH ezjail-admin delete |
51 | removes a jail from ezjails /etc/ezjail resource directory thus preventing | 52 | removes a jail from ezjails etc/ezjail/ resource directory thus preventing |
52 | it from being brought up on next reboot. | 53 | it from being brought up on next reboot. |
53 | 54 | ||
54 | It then removes the /etc/fstab.hostname entry, if it exists. | 55 | It then removes the /etc/fstab.hostname entry, if it exists. |
55 | 56 | ||
56 | If the -w (wipe) option is given, the directory pointed to by the jail | 57 | If the -w (wipe) option is given, the directory pointed to by the jail |
57 | root entry is removed as well as the soft link, if necessary. | 58 | root entry is removed as well as the soft link in ezjails root dir. |
58 | .SH ezjail-admin list | 59 | .SH ezjail-admin list |
59 | lists all jails inside ezjails scope, together with some information on | 60 | lists all jails inside ezjails scope, together with some information on |
60 | them. | 61 | them. |
diff --git a/man5/ezjail.5 b/man5/ezjail.5 index 842af30..1f84ffa 100755 --- a/man5/ezjail.5 +++ b/man5/ezjail.5 | |||
@@ -17,7 +17,6 @@ is filled with most userland binaries and libraries and then mounted | |||
17 | read only into a number of stripped down jails via | 17 | read only into a number of stripped down jails via |
18 | .B mount_nullfs(8) | 18 | .B mount_nullfs(8) |
19 | - thus saving lots of inodes and memory resources. | 19 | - thus saving lots of inodes and memory resources. |
20 | |||
21 | .SH INVOCATION | 20 | .SH INVOCATION |
22 | The ezjail script | 21 | The ezjail script |
23 | .B EZJAIL_PREFIX/etc/rc.d/ezjail.sh | 22 | .B EZJAIL_PREFIX/etc/rc.d/ezjail.sh |