diff options
-rw-r--r-- | src/fbuilder/build_profile.c | 1 | ||||
-rw-r--r-- | src/firejail/sandbox.c | 1 | ||||
-rw-r--r-- | src/firejail/usage.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index 24cb4472c..d57db7f42 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c | |||
@@ -53,7 +53,6 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { | |||
53 | cmd[curr_len++] = "--noprofile"; | 53 | cmd[curr_len++] = "--noprofile"; |
54 | cmd[curr_len++] = "--caps.drop=all"; | 54 | cmd[curr_len++] = "--caps.drop=all"; |
55 | cmd[curr_len++] = "--seccomp=!chroot"; | 55 | cmd[curr_len++] = "--seccomp=!chroot"; |
56 | cmd[curr_len++] = "--shell=none"; | ||
57 | cmd[curr_len++] = output; | 56 | cmd[curr_len++] = output; |
58 | if (arg_appimage) | 57 | if (arg_appimage) |
59 | cmd[curr_len++] = "--appimage"; | 58 | cmd[curr_len++] = "--appimage"; |
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 6b84faf13..5b9606fbd 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -565,6 +565,7 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) { | |||
565 | else { // appimage | 565 | else { // appimage |
566 | char *arg[5]; | 566 | char *arg[5]; |
567 | int index = 0; | 567 | int index = 0; |
568 | assert(cfg.usershell); | ||
568 | arg[index++] = cfg.usershell; | 569 | arg[index++] = cfg.usershell; |
569 | if (cfg.command_line) { | 570 | if (cfg.command_line) { |
570 | if (arg_debug) | 571 | if (arg_debug) |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index c379c2ab4..14cd1f3a4 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -242,8 +242,6 @@ static char *usage_str = | |||
242 | " --seccomp.32[.drop,.keep][=syscall] - like above but for 32 bit architecture.\n" | 242 | " --seccomp.32[.drop,.keep][=syscall] - like above but for 32 bit architecture.\n" |
243 | " --seccomp-error-action=errno|kill|log - change error code, kill process\n" | 243 | " --seccomp-error-action=errno|kill|log - change error code, kill process\n" |
244 | "\tor log the attempt.\n" | 244 | "\tor log the attempt.\n" |
245 | " --shell=none - run the program directly without a user shell.\n" | ||
246 | " --shell=program - set default user shell.\n" | ||
247 | " --shutdown=name|pid - shutdown the sandbox identified by name or PID.\n" | 245 | " --shutdown=name|pid - shutdown the sandbox identified by name or PID.\n" |
248 | " --tab - enable shell tab completion in sandboxes using private or\n" | 246 | " --tab - enable shell tab completion in sandboxes using private or\n" |
249 | "\twhitelisted home directories.\n" | 247 | "\twhitelisted home directories.\n" |