github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 22:01:33 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

shell none set as default

Browse source
This commit is contained in:
netblue30 2022-06-19 13:24:29 -04:00
parent fc912c0821
commit 4d79566ae3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/firejail/main.c
View file

@ -105,7 +105,7 @@ char *arg_netfilter_file = NULL; // netfilter file
char *arg_netfilter6_file = NULL; // netfilter6 file
char *arg_netns = NULL; // "ip netns"-created network namespace to use
int arg_doubledash = 0; // double dash
int arg_shell_none = 0; // run the program directly without a shell
int arg_shell_none = 1; // run the program directly without a shell
int arg_private_dev = 0; // private dev directory
int arg_keep_dev_shm = 0; // preserve /dev/shm
int arg_private_etc = 0; // private etc directory
@ -2692,7 +2692,7 @@ int main(int argc, char **argv, char **envp) {
// already handled
}
else if (strcmp(argv[i], "--shell=none") == 0) {
arg_shell_none = 1;
fprintf(stderr, "Warning: --shell=none is done by default; the command will be deprecated\n");
if (cfg.shell) {
fprintf(stderr, "Error: a shell was already specified\n");
return 1;

2
src/firejail/profile.c
View file

@ -367,7 +367,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
return 0;
}
else if (strcmp(ptr, "shell none") == 0) {
arg_shell_none = 1;
fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n");
return 0;
}
else if (strcmp(ptr, "tracelog") == 0) {