diff options
author | 2023-01-18 10:37:03 -0500 | |
---|---|---|
committer | 2023-01-18 10:37:03 -0500 | |
commit | 594fb293cdcbdc6d763df720392ec003ab702dbf (patch) | |
tree | 8e4bd0ae025faf6f1e491f65898d596407aa4df2 | |
parent | update README.md (diff) | |
download | firejail-594fb293cdcbdc6d763df720392ec003ab702dbf.tar.gz firejail-594fb293cdcbdc6d763df720392ec003ab702dbf.tar.zst firejail-594fb293cdcbdc6d763df720392ec003ab702dbf.zip |
merges
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | src/firejail/usage.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -786,6 +786,8 @@ nolanl (https://github.com/nolanl) | |||
786 | - added localtime to signal-desktop's profile | 786 | - added localtime to signal-desktop's profile |
787 | nyancat18 (https://github.com/nyancat18) | 787 | nyancat18 (https://github.com/nyancat18) |
788 | - added ardour4, dooble, karbon, krita profiles | 788 | - added ardour4, dooble, karbon, krita profiles |
789 | nya1 (https://github.com/nya1) | ||
790 | - remove apparmor options in --help when building without apparmor support | ||
789 | Ondra Nekola (https://github.com/satai) | 791 | Ondra Nekola (https://github.com/satai) |
790 | - allow firefox theming with non-global themes | 792 | - allow firefox theming with non-global themes |
791 | OndrejMalek (https://github.com/OndrejMalek) | 793 | OndrejMalek (https://github.com/OndrejMalek) |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index 0a4c8a483..bf4550dd8 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -30,10 +30,12 @@ static char *usage_str = | |||
30 | " -- - signal the end of options and disables further option processing.\n" | 30 | " -- - signal the end of options and disables further option processing.\n" |
31 | " --allow-debuggers - allow tools such as strace and gdb inside the sandbox.\n" | 31 | " --allow-debuggers - allow tools such as strace and gdb inside the sandbox.\n" |
32 | " --allusers - all user home directories are visible inside the sandbox.\n" | 32 | " --allusers - all user home directories are visible inside the sandbox.\n" |
33 | #ifdef HAVE_APPARMOR | ||
33 | " --apparmor - enable AppArmor confinement with the default profile.\n" | 34 | " --apparmor - enable AppArmor confinement with the default profile.\n" |
34 | " --apparmor=profile_name - enable AppArmor confinement with a\n" | 35 | " --apparmor=profile_name - enable AppArmor confinement with a\n" |
35 | "\tcustom profile.\n" | 36 | "\tcustom profile.\n" |
36 | " --apparmor.print=name|pid - print apparmor status.\n" | 37 | " --apparmor.print=name|pid - print apparmor status.\n" |
38 | #endif | ||
37 | " --appimage - sandbox an AppImage application.\n" | 39 | " --appimage - sandbox an AppImage application.\n" |
38 | #ifdef HAVE_NETWORK | 40 | #ifdef HAVE_NETWORK |
39 | " --bandwidth=name|pid - set bandwidth limits.\n" | 41 | " --bandwidth=name|pid - set bandwidth limits.\n" |