diff options
author | 2022-06-21 08:51:00 -0400 | |
---|---|---|
committer | 2022-06-21 08:51:00 -0400 | |
commit | 7ad735deafa80114a17b20790de63f7e973b1bb4 (patch) | |
tree | b612b51fdc2171c331bffe811c78e84cc21dc446 | |
parent | Revert "xonotic.profile: fix audit denial spam" (diff) | |
download | firejail-7ad735deafa80114a17b20790de63f7e973b1bb4.tar.gz firejail-7ad735deafa80114a17b20790de63f7e973b1bb4.tar.zst firejail-7ad735deafa80114a17b20790de63f7e973b1bb4.zip |
deprecating --shell (3) (#5196)
-rw-r--r-- | src/firejail/sandbox.c | 6 | ||||
-rwxr-xr-x | test/filters/noroot.exp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 5b9606fbd..e8c4a445a 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -528,7 +528,7 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) { | |||
528 | //**************************************** | 528 | //**************************************** |
529 | // start the program without using a shell | 529 | // start the program without using a shell |
530 | //**************************************** | 530 | //**************************************** |
531 | else if (!arg_appimage) { | 531 | else if (!arg_appimage && !arg_doubledash) { |
532 | if (arg_debug) { | 532 | if (arg_debug) { |
533 | int i; | 533 | int i; |
534 | for (i = cfg.original_program_index; i < cfg.original_argc; i++) { | 534 | for (i = cfg.original_program_index; i < cfg.original_argc; i++) { |
@@ -560,9 +560,9 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) { | |||
560 | execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]); | 560 | execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]); |
561 | } | 561 | } |
562 | //**************************************** | 562 | //**************************************** |
563 | // start the program using a shell (appimages) | 563 | // start the program using a shell |
564 | //**************************************** | 564 | //**************************************** |
565 | else { // appimage | 565 | else { // appimage or double-dash |
566 | char *arg[5]; | 566 | char *arg[5]; |
567 | int index = 0; | 567 | int index = 0; |
568 | assert(cfg.usershell); | 568 | assert(cfg.usershell); |
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp index 66e1e4e27..942aedbcb 100755 --- a/test/filters/noroot.exp +++ b/test/filters/noroot.exp | |||
@@ -81,11 +81,11 @@ spawn $env(SHELL) | |||
81 | send -- "firejail --debug --join=test\r" | 81 | send -- "firejail --debug --join=test\r" |
82 | expect { | 82 | expect { |
83 | timeout {puts "TESTING ERROR 13\n";exit} | 83 | timeout {puts "TESTING ERROR 13\n";exit} |
84 | "User namespace detected" | 84 | "Joining user namespace" |
85 | } | 85 | } |
86 | expect { | 86 | expect { |
87 | timeout {puts "TESTING ERROR 14\n";exit} | 87 | timeout {puts "TESTING ERROR 14\n";exit} |
88 | "Joining user namespace" | 88 | "Child process initialized" |
89 | } | 89 | } |
90 | sleep 1 | 90 | sleep 1 |
91 | 91 | ||