diff options
author | netblue30 <netblue30@yahoo.com> | 2018-02-27 07:52:49 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-02-27 07:52:49 -0500 |
commit | 1738bbf7181d6c3b6d9f82bfa5b3f6d21ad503c3 (patch) | |
tree | 7a26fe8c3292cda28a65a0ab49a46a87fac53bb5 /src | |
parent | Sync start-tor-browser with torbrowser-launcher profile' (diff) | |
download | firejail-1738bbf7181d6c3b6d9f82bfa5b3f6d21ad503c3.tar.gz firejail-1738bbf7181d6c3b6d9f82bfa5b3f6d21ad503c3.tar.zst firejail-1738bbf7181d6c3b6d9f82bfa5b3f6d21ad503c3.zip |
appimage enhancements
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/main.c | 3 | ||||
-rw-r--r-- | src/firejail/sandbox.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 7543c5f4b..e8556de2d 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -2321,6 +2321,9 @@ int main(int argc, char **argv) { | |||
2321 | cfg.command_name = strdup(argv[i]); | 2321 | cfg.command_name = strdup(argv[i]); |
2322 | if (!cfg.command_name) | 2322 | if (!cfg.command_name) |
2323 | errExit("strdup"); | 2323 | errExit("strdup"); |
2324 | |||
2325 | // disable shell=* for appimages | ||
2326 | arg_shell_none = 0; | ||
2324 | } | 2327 | } |
2325 | else | 2328 | else |
2326 | extract_command_name(i, argv); | 2329 | extract_command_name(i, argv); |
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 503d822a9..96b7b267b 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -799,7 +799,8 @@ int sandbox(void* sandbox_arg) { | |||
799 | } | 799 | } |
800 | } | 800 | } |
801 | 801 | ||
802 | if (arg_private_bin) { | 802 | // private-bin is disabled for appimages |
803 | if (arg_private_bin && !arg_appimage) { | ||
803 | if (cfg.chrootdir) | 804 | if (cfg.chrootdir) |
804 | fwarning("private-bin feature is disabled in chroot\n"); | 805 | fwarning("private-bin feature is disabled in chroot\n"); |
805 | else if (arg_overlay) | 806 | else if (arg_overlay) |
@@ -818,7 +819,8 @@ int sandbox(void* sandbox_arg) { | |||
818 | } | 819 | } |
819 | } | 820 | } |
820 | 821 | ||
821 | if (arg_private_lib) { | 822 | // private-lib is disabled for appimages |
823 | if (arg_private_lib && !arg_appimage) { | ||
822 | if (cfg.chrootdir) | 824 | if (cfg.chrootdir) |
823 | fwarning("private-lib feature is disabled in chroot\n"); | 825 | fwarning("private-lib feature is disabled in chroot\n"); |
824 | else if (arg_overlay) | 826 | else if (arg_overlay) |