Skip to content

Commit

Permalink
Merge pull request #3347 from aerusso/pulls/documentation-globbing
Browse files Browse the repository at this point in the history
Clarify that file globbing occurs only at start
  • Loading branch information
rusty-snake authored Apr 12, 2020
2 parents ca6eec7 + 7352501 commit aa62872
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/man/firejail-profile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ host filesystem. Each line describes a file/directory that is inaccessible
(\fBblacklist\fR), a read-only file or directory (\fBread-only\fR),
a tmpfs mounted on top of an existing directory (\fBtmpfs\fR),
or mount-bind a directory or file on top of another directory or file (\fBbind\fR).
Use \fBprivate\fR to set private mode.
File globbing is supported, and PATH and HOME directories are searched.
Use \fBprivate\fR to set private mode. File globbing is supported, and PATH and
HOME directories are searched, see the \fBfirejail\f(1) \fBFILE GLOBBING\fR section
for more details.
Examples:
.TP
\fBblacklist file_or_directory
Expand Down
13 changes: 10 additions & 3 deletions src/man/firejail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2835,7 +2835,11 @@ List all sandboxed processes.

.SH FILE GLOBBING
.TP
Globbing is the operation that expands a wildcard pattern into the list of pathnames matching the pattern. Matching is defined by:
Globbing is the operation that expands a wildcard pattern into the
list of pathnames matching the pattern. This pattern is matched at
firejail \fBstart\fR, and is NOT UPDATED at runtime. \fBFiles matching
a blacklist, but created after firejail start will be accessible within
the jail.\fR Matching is defined by:
.br

.br
Expand All @@ -2846,12 +2850,15 @@ Globbing is the operation that expands a wildcard pattern into the list of pathn
- '[' denotes a range of characters
.br
.TP
The globbing feature is implemented using glibc glob command. For more information on the wildcard syntax see man 7 glob.
The globbing feature is implemented using glibc glob command. For
more information on the wildcard syntax see man 7 glob.
.br

.br
.TP
The following command line options are supported: \-\-blacklist, \-\-private-bin, \-\-noexec, \-\-read-only, \-\-read-write, \-\-tmpfs, and \-\-whitelist.
The following command line options are supported: \-\-blacklist,
\-\-private-bin, \-\-noexec, \-\-read-only, \-\-read-write,
\-\-tmpfs, and \-\-whitelist.
.br

.br
Expand Down

0 comments on commit aa62872

Please sign in to comment.