diff options
| author |  smitsohu <smitsohu@gmail.com> | 2019-03-16 19:16:16 +0100 |
|---|---|---|
| committer | smitsohu <smitsohu@gmail.com> | 2019-03-16 19:16:16 +0100 |
| commit | cb46b1fdc2419fb8379188a50752c0d51f54cbfc (patch) | |
| tree | 42c73d7dfbaf5307da1a19a966ad95176ecf1805 /src | |
| parent | hardening: replace setuid/setgid calls with setresuid/setresgid (diff) | |
| parent | Follow-up on flatpak/snap support (#2601) (diff) | |
| download | firejail-cb46b1fdc2419fb8379188a50752c0d51f54cbfc.tar.gz firejail-cb46b1fdc2419fb8379188a50752c0d51f54cbfc.tar.zst firejail-cb46b1fdc2419fb8379188a50752c0d51f54cbfc.zip | |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'src')
| -rw-r--r-- | src/firecfg/firecfg.config | 1 | ||||
| -rw-r--r-- | src/man/firejail.txt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index f1be8bfd9..7531206f5 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
| @@ -432,6 +432,7 @@ scallion | |||
| 432 | scribus | 432 | scribus |
| 433 | sdat2img | 433 | sdat2img |
| 434 | seahorse | 434 | seahorse |
| 435 | seahorse-daemon | ||
| 435 | seahorse-tool | 436 | seahorse-tool |
| 436 | seamonkey | 437 | seamonkey |
| 437 | seamonkey-bin | 438 | seamonkey-bin |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 8146d1a2e..048db098c 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
| @@ -48,6 +48,10 @@ Firejail allows the user to manage application security using security profiles. | |||
| 48 | Each profile defines a set of permissions for a specific application or group | 48 | Each profile defines a set of permissions for a specific application or group |
| 49 | of applications. The software includes security profiles for a number of more common | 49 | of applications. The software includes security profiles for a number of more common |
| 50 | Linux programs, such as Mozilla Firefox, Chromium, VLC, Transmission etc. | 50 | Linux programs, such as Mozilla Firefox, Chromium, VLC, Transmission etc. |
| 51 | .PP | ||
| 52 | Alternative sandbox technologies like snap (https://snapcraft.io/) and flatpak (https://flatpak.org/) | ||
| 53 | are not supported. Snap and flatpak packages have their own native management tools and will | ||
| 54 | not work when sandboxed with Firejail. | ||
| 51 | 55 | ||
| 52 | .SH USAGE | 56 | .SH USAGE |
| 53 | Without any options, the sandbox consists of a filesystem build in a new mount namespace, | 57 | Without any options, the sandbox consists of a filesystem build in a new mount namespace, |