github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

deprecating --shell (3) (#5196)

Browse source
This commit is contained in:
netblue30 2022-06-21 08:51:00 -04:00
parent 9c4772f653
commit 7ad735deaf
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/firejail/sandbox.c
View file

@ -528,7 +528,7 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
//**************************************** //****************************************
// start the program without using a shell // start the program without using a shell
//**************************************** //****************************************
else if (!arg_appimage) { else if (!arg_appimage && !arg_doubledash) {
if (arg_debug) { if (arg_debug) {
int i; int i;
for (i = cfg.original_program_index; i < cfg.original_argc; i++) { 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) {
execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]); execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]);
} }
//**************************************** //****************************************
// start the program using a shell (appimages) // start the program using a shell
//**************************************** //****************************************
else { // appimage else { // appimage or double-dash
char *arg[5]; char *arg[5];
int index = 0; int index = 0;
assert(cfg.usershell); assert(cfg.usershell);

4
test/filters/noroot.exp
View file

@ -81,11 +81,11 @@ spawn $env(SHELL)
send -- "firejail --debug --join=test\r" send -- "firejail --debug --join=test\r"
expect { expect {
timeout {puts "TESTING ERROR 13\n";exit} timeout {puts "TESTING ERROR 13\n";exit}
"User namespace detected" "Joining user namespace"
} }
expect { expect {
timeout {puts "TESTING ERROR 14\n";exit} timeout {puts "TESTING ERROR 14\n";exit}
"Joining user namespace" "Child process initialized"
} }
sleep 1 sleep 1