diff options
author | Aleksey Manevich <manevich.aleksey@gmail.com> | 2016-09-23 19:44:42 +0300 |
---|---|---|
committer | Aleksey Manevich <manevich.aleksey@gmail.com> | 2016-09-23 19:44:42 +0300 |
commit | 430a442a99e8ebf2f3e18f22bdf182abd9103136 (patch) | |
tree | d62d363673151c1b45d6513d68da895e5d445ed1 /src/man | |
parent | join-or-start option (diff) | |
download | firejail-430a442a99e8ebf2f3e18f22bdf182abd9103136.tar.gz firejail-430a442a99e8ebf2f3e18f22bdf182abd9103136.tar.zst firejail-430a442a99e8ebf2f3e18f22bdf182abd9103136.zip |
update man
Diffstat (limited to 'src/man')
-rw-r--r-- | src/man/firejail-profile.txt | 6 | ||||
-rw-r--r-- | src/man/firejail.txt | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index cc37670aa..68420ae9d 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -467,6 +467,12 @@ available in the new namespace is a new loopback interface (lo). | |||
467 | Use this option to deny network access to programs that don't | 467 | Use this option to deny network access to programs that don't |
468 | really need network access. | 468 | really need network access. |
469 | 469 | ||
470 | .SH Other | ||
471 | .TP | ||
472 | \fBjoin-or-start sandboxname | ||
473 | Join the sandbox identified by name or start a new one. | ||
474 | Same as "firejail --join=sandboxname" command if sandbox with specified name exists, otherwise same as "name sandboxname". | ||
475 | |||
470 | .SH RELOCATING PROFILES | 476 | .SH RELOCATING PROFILES |
471 | For various reasons some users might want to keep the profile files in a different directory. | 477 | For various reasons some users might want to keep the profile files in a different directory. |
472 | Using \fB--profile-path\fR command line option, Firejail can be instructed to look for profiles | 478 | Using \fB--profile-path\fR command line option, Firejail can be instructed to look for profiles |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 29b0f05a2..88c884801 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -619,6 +619,13 @@ Switching to pid 1932, the first child process inside the sandbox | |||
619 | valid_lft forever preferred_lft forever | 619 | valid_lft forever preferred_lft forever |
620 | 620 | ||
621 | .TP | 621 | .TP |
622 | \fB\-\-join-or-start=name | ||
623 | Join the sandbox identified by name or start a new one. | ||
624 | Same as "firejail --join=name" if sandbox with specified name exists, otherwise same as "firejail --name=name ..." | ||
625 | .br | ||
626 | Note that in contrary to other join options there is respective profile option. | ||
627 | |||
628 | .TP | ||
622 | \fB\-\-ls=name|pid dir_or_filename | 629 | \fB\-\-ls=name|pid dir_or_filename |
623 | List files in sandbox container, see \fBFILE TRANSFER\fR section for more details. | 630 | List files in sandbox container, see \fBFILE TRANSFER\fR section for more details. |
624 | 631 | ||