Skip to content

Commit b5903c6

Browse files
authored
Merge pull request #37 from A-dead-pixel/Documentation-PR
Improve documentation a bit
2 parents f74a90f + 507a8d4 commit b5903c6

File tree

1 file changed

+23
-28
lines changed

1 file changed

+23
-28
lines changed

doc/sio2jail.1.scd

+23-28
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ of the hardware sio2jail runs on.
3636

3737
*-s, --stderr*
3838
Pass stderr from the sandboxed program,
39-
instead of redirecting it to stderr.
39+
instead of redirecting it to /dev/null.
4040

4141
*-o* _format_, *--output* _format_
4242
Use the specified _format_ for outputting the execution report.
4343

44-
* --stimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
45-
* --utimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
44+
*--stimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
45+
*--utimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
4646
*--ustimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
47-
* --rtimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*] ++
47+
*--rtimelimit* _limit_[*u*|*ms*|*s*|*m*|*h*|*d*]
4848
Set system (*stimelimit*), user (*utimelimit*),
4949
user+system (*ustimelimit*) or real (*rtimelimit*)
5050
time limit to _limit_.
5151

5252
Use *u*/*ms*/*s*/*m*/*h*/*d* (case-insensitive) unit suffices
53-
to specify time in microseconds, miliseconds, seconds, minutes,
53+
to specify time in microseconds, milliseconds, seconds, minutes,
5454
hours and days respectively.
5555
Defaults to microseconds if unit is not specified.
5656

@@ -59,8 +59,8 @@ of the hardware sio2jail runs on.
5959
*--output-limit* _limit_[*b*|*k*|*m*|*g*]
6060
Set the output file size limit to _limit_.
6161

62-
Use with *k*/*m*/*g* (case-insensitive) unit suffices
63-
for 1, 1024, 1024**2, 1024**3 bytes respectively. Default is kibibytes.
62+
Use with *b*/*k*/*m*/*g* (case-insensitive) unit suffices
63+
for 1024\*\*{0,1,2,3} bytes respectively. Default is kibibytes.
6464

6565
This is currently implemented as an rlimit of maximum created file
6666
size (See: *RLIMIT\_FSIZE* in *getrlimit*(2)), which means:
@@ -85,7 +85,7 @@ of the hardware sio2jail runs on.
8585
*--instruction-count-limit* _limit_[*k*|*m*|*g*]
8686
Set instruction count limit. Requires *--perf*.
8787

88-
Use with *k*/*m*/*g* sufixes for 10**{3,6,9} respectively.
88+
Use with *k*/*m*/*g* suffixes for 10\*\*{3,6,9} respectively.
8989

9090
Use 0 for no limit (the default).
9191

@@ -110,7 +110,7 @@ of the hardware sio2jail runs on.
110110
To select syscall policy use *--policy*.
111111

112112
*-p* _policy_, *--policy* _policy_
113-
Select *seccomp*(2) syscall policy. Requires seccomp.
113+
Select *seccomp*(2) syscall policy. Requires *--seccomp*.
114114

115115
_policy_ must be one of available syscall policies:
116116

@@ -123,17 +123,17 @@ of the hardware sio2jail runs on.
123123

124124
Ptrace is used for two purposes:
125125

126-
- restoring normal singal behaviour when pid-namespaces are in use
126+
- restoring normal signal behaviour when PID namespaces are in use
127127

128128
- providing seccomp policy more flexibility by using the *TRACE*
129129
seccomp action and making the decision whether to allow
130130
the syscall in userspace
131131

132132
*-m* _limit_, *--memory-limit* _limit_
133-
Set memory limit to _limit_. Requires seccomp.
133+
Set memory limit to _limit_. Requires *--seccomp*.
134134

135-
Use with *k*/*m*/*g* (case-insensitive) unit suffices
136-
for 1, 1024, 1024**2, 1024**3 bytes respectively. Default is kibibytes.
135+
Use with *b*/*k*/*m*/*g* (case-insensitive) unit suffices
136+
for 1024\*\*{0,1,2,3} bytes respectively. Default is kibibytes.
137137

138138
Use 0 for no limit.
139139

@@ -159,9 +159,9 @@ of the hardware sio2jail runs on.
159159
a separate view of the filesystem (kinda like chroot).
160160

161161
This prevents the sandboxed program from seeing or manipulating
162-
files which were not explicitely made accessible to it,
162+
files which were not explicitly made accessible to it,
163163
and allows for use of runtime environments different than
164-
those installed systemwite (eg. different compiler version).
164+
those installed systemwide (eg. a different compiler version).
165165

166166
*-b* _path-outside_:_path-inside_[:_flags_]
167167
*--bind* _path-outside_:_path-inside_[:_flags_]
@@ -171,19 +171,14 @@ of the hardware sio2jail runs on.
171171
This option can be passed multiple times to define multiple
172172
bind-mounts.
173173

174-
_path-inside_ must be a valid mountpoint.
175-
176-
This means that it must be either an empty directory,
177-
if _path-outside_ is a directory
174+
_path-inside_ must be a valid mountpoint. This means that it must be
175+
either an empty directory, if _path-outside_ is a directory
178176
or a regular file, if _path-outside_ is a regular file.
179177

180-
_flags_, if specified, must be of form (*ro*|*rw*)[*,dev*]
181-
182-
*ro* - mount read-only (the default)
183-
184-
*rw* - mount read-write
185-
186-
*dev* - allow the mounted file to behave as a device node
178+
_flags_, if specified, must be of form (*ro*|*rw*)[*,dev*], where:
179+
- *ro* - mount read-only (the default)
180+
- *rw* - mount read-write
181+
- *dev* - allow the mounted file to behave as a device node
187182

188183
By default, unless *-B* is specified, the file to be executed
189184
is mounted read-only at /exe, as if the following was passed:
@@ -226,7 +221,7 @@ of the hardware sio2jail runs on.
226221
*--uts-namespace* *on*|*off*
227222
Enable or disable use of UTS namespaces to eliminate the impact of
228223
hostname and other UTS metadata on the sandboxed program.
229-
Requiers *--user-namespace*. Enabled by default.
224+
Requires *--user-namespace*. Enabled by default.
230225

231226
When enabled, this option sets the hostname and domainname
232227
inside the sandbox to "sio2jail".
@@ -244,7 +239,7 @@ of the hardware sio2jail runs on.
244239
network isolated from anything outside the sandbox.
245240

246241
*--ipc-namespace* *on*|*off*
247-
Enable or disable the ose of IPC namespaces.
242+
Enable or disable the use of IPC namespaces.
248243
Requires *--user-namespace*. Enabled by default.
249244

250245
This confines the sandboxed program to a view of IPC

0 commit comments

Comments
 (0)