diff options
author | Chiraag Nataraj <chiraag.nataraj@gmail.com> | 2018-05-03 08:54:44 -0400 |
---|---|---|
committer | Chiraag Nataraj <chiraag.nataraj@gmail.com> | 2018-05-03 08:54:44 -0400 |
commit | 3dfe93cd873f0467e7ee910f5e4463d757c9a718 (patch) | |
tree | 4d0e954babb233c3f35fa635de6ae993c64013c4 | |
parent | Add --keep-var-tmp and associated profile option (diff) | |
download | firejail-3dfe93cd873f0467e7ee910f5e4463d757c9a718.tar.gz firejail-3dfe93cd873f0467e7ee910f5e4463d757c9a718.tar.zst firejail-3dfe93cd873f0467e7ee910f5e4463d757c9a718.zip |
Moved documentation to conform with alphabetical ordering
-rw-r--r-- | src/firejail/usage.c | 2 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 6 | ||||
-rw-r--r-- | src/man/firejail.txt | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index be5eb3989..88614298e 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -94,6 +94,7 @@ static char *usage_str = | |||
94 | " --join-network=name|pid - join the network namespace.\n" | 94 | " --join-network=name|pid - join the network namespace.\n" |
95 | #endif | 95 | #endif |
96 | " --join-or-start=name|pid - join the sandbox or start a new one.\n" | 96 | " --join-or-start=name|pid - join the sandbox or start a new one.\n" |
97 | " --keep-var-tmp - /var/tmp directory is untouched.\n" | ||
97 | " --list - list all sandboxes.\n" | 98 | " --list - list all sandboxes.\n" |
98 | #ifdef HAVE_FILE_TRANSFER | 99 | #ifdef HAVE_FILE_TRANSFER |
99 | " --ls=name|pid dir_or_filename - list files in sandbox container.\n" | 100 | " --ls=name|pid dir_or_filename - list files in sandbox container.\n" |
@@ -221,7 +222,6 @@ static char *usage_str = | |||
221 | " --writable-run-user - allow access to /run/user/$UID/systemd and\n" | 222 | " --writable-run-user - allow access to /run/user/$UID/systemd and\n" |
222 | "\t/run/user/$UID/gnupg.\n" | 223 | "\t/run/user/$UID/gnupg.\n" |
223 | " --writable-var - /var directory is mounted read-write.\n" | 224 | " --writable-var - /var directory is mounted read-write.\n" |
224 | " --keep-var-tmp - /var/tmp directory is untouched.\n" | ||
225 | " --writable-var-log - use the real /var/log directory, not a clone.\n" | 225 | " --writable-var-log - use the real /var/log directory, not a clone.\n" |
226 | #ifdef HAVE_X11 | 226 | #ifdef HAVE_X11 |
227 | " --x11 - enable X11 sandboxing. The software checks first if Xpra is\n" | 227 | " --x11 - enable X11 sandboxing. The software checks first if Xpra is\n" |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index c73f23b94..f136be510 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -164,6 +164,9 @@ Mount-bind file1 on top of file2. This option is only available when running as | |||
164 | \fBdisable-mnt | 164 | \fBdisable-mnt |
165 | Disable /mnt, /media, /run/mount and /run/media access. | 165 | Disable /mnt, /media, /run/mount and /run/media access. |
166 | .TP | 166 | .TP |
167 | \fBkeep-var-tmp | ||
168 | /var/tmp directory is untouched. | ||
169 | .TP | ||
167 | \fBmkdir directory | 170 | \fBmkdir directory |
168 | Create a directory in user home or under /tmp before the sandbox is started. | 171 | Create a directory in user home or under /tmp before the sandbox is started. |
169 | The directory is created if it doesn't already exist. | 172 | The directory is created if it doesn't already exist. |
@@ -280,9 +283,6 @@ Disable the default blacklisting of run/user/$UID/systemd and /run/user/$UID/gnu | |||
280 | \fBwritable-var | 283 | \fBwritable-var |
281 | Mount /var directory read-write. | 284 | Mount /var directory read-write. |
282 | .TP | 285 | .TP |
283 | \fBkeep-var-tmp | ||
284 | /var/tmp directory is untouched. | ||
285 | .TP | ||
286 | \fBwritable-var-log | 286 | \fBwritable-var-log |
287 | Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log | 287 | Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log |
288 | directory, and a skeleton filesystem is created based on the original /var/log. | 288 | directory, and a skeleton filesystem is created based on the original /var/log. |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 87326a7bd..af9fe4b90 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -678,6 +678,16 @@ Same as "firejail --join=name" if sandbox with specified name exists, otherwise | |||
678 | Note that in contrary to other join options there is respective profile option. | 678 | Note that in contrary to other join options there is respective profile option. |
679 | 679 | ||
680 | .TP | 680 | .TP |
681 | \fB\-\-keep-var-tmp | ||
682 | /var/tmp directory is untouched. | ||
683 | .br | ||
684 | |||
685 | .br | ||
686 | Example: | ||
687 | .br | ||
688 | $ firejail --keep-var-tmp | ||
689 | |||
690 | .TP | ||
681 | \fB\-\-ls=name|pid dir_or_filename | 691 | \fB\-\-ls=name|pid dir_or_filename |
682 | List files in sandbox container, see \fBFILE TRANSFER\fR section for more details. | 692 | List files in sandbox container, see \fBFILE TRANSFER\fR section for more details. |
683 | 693 | ||
@@ -2129,16 +2139,6 @@ Example: | |||
2129 | $ sudo firejail --writable-var | 2139 | $ sudo firejail --writable-var |
2130 | 2140 | ||
2131 | .TP | 2141 | .TP |
2132 | \fB\-\-keep-var-tmp | ||
2133 | /var/tmp directory is untouched. | ||
2134 | .br | ||
2135 | |||
2136 | .br | ||
2137 | Example: | ||
2138 | .br | ||
2139 | $ sudo firejail --keep-var-tmp | ||
2140 | |||
2141 | .TP | ||
2142 | \fB\-\-writable-var-log | 2142 | \fB\-\-writable-var-log |
2143 | Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log | 2143 | Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log |
2144 | directory, and a skeleton filesystem is created based on the original /var/log. | 2144 | directory, and a skeleton filesystem is created based on the original /var/log. |