diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2023-07-19 12:54:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-19 12:54:53 +0000 |
commit | 9863f982ca148f687a56690e2aeed10014d05e59 (patch) | |
tree | 4bb5bddc7a92a66564031f61d67abe2d4a347500 /src/firejail | |
parent | zsh: add shell completion for --tab (diff) | |
download | firejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.gz firejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.zst firejail-9863f982ca148f687a56690e2aeed10014d05e59.zip |
modif: drop deprecated 'shell' option references (#5894)
The `shell` option has been removed. Remove stale references.
This does NOT remove `shell none`-related code comments in:
- src/firejail/fs_lib.c (L433-L441)
- src/firejail/join.c (L415-L417)
Relates to #5196.
Suggested by #5891.
Diffstat (limited to 'src/firejail')
-rw-r--r-- | src/firejail/main.c | 2 | ||||
-rw-r--r-- | src/firejail/profile.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 45b199db4..b0d5dac17 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -2806,7 +2806,7 @@ int main(int argc, char **argv, char **envp) { | |||
2806 | // already handled | 2806 | // already handled |
2807 | } | 2807 | } |
2808 | else if (strncmp(argv[i], "--shell=", 8) == 0) { | 2808 | else if (strncmp(argv[i], "--shell=", 8) == 0) { |
2809 | fprintf(stderr, "Warning: --shell feature has been deprecated\n"); | 2809 | fprintf(stderr, "Error: \"shell none\" is done by default now; the \"shell\" command has been removed\n"); |
2810 | exit(1); | 2810 | exit(1); |
2811 | } | 2811 | } |
2812 | else if (strcmp(argv[i], "-c") == 0) { | 2812 | else if (strcmp(argv[i], "-c") == 0) { |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 07449f646..bdaaed433 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -371,8 +371,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
371 | arg_caps_drop_all = 1; | 371 | arg_caps_drop_all = 1; |
372 | return 0; | 372 | return 0; |
373 | } | 373 | } |
374 | else if (strcmp(ptr, "shell none") == 0) { | 374 | else if (strcmp(ptr, "shell ") == 0) { |
375 | fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n"); | 375 | fprintf(stderr, "Warning: \"shell none\" is done by default now; the \"shell\" command has been removed\n"); |
376 | return 0; | 376 | return 0; |
377 | } | 377 | } |
378 | else if (strcmp(ptr, "tracelog") == 0) { | 378 | else if (strcmp(ptr, "tracelog") == 0) { |