diff options
author | netblue30 <netblue30@protonmail.com> | 2022-06-20 08:18:13 -0400 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2022-06-20 08:18:13 -0400 |
commit | 4b4d752158e2a7164765c6c7247ef8b4d6014689 (patch) | |
tree | 18fa1b4e32564376b6502a1cc7b1caed27bbdc54 /src/firejail/fs_lib.c | |
parent | reverting previous seccomp log fix (#5207) (diff) | |
download | firejail-4b4d752158e2a7164765c6c7247ef8b4d6014689.tar.gz firejail-4b4d752158e2a7164765c6c7247ef8b4d6014689.tar.zst firejail-4b4d752158e2a7164765c6c7247ef8b4d6014689.zip |
deprecating --shell (#5196)
Diffstat (limited to 'src/firejail/fs_lib.c')
-rw-r--r-- | src/firejail/fs_lib.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index 848691a56..5d6d81ae1 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -392,8 +392,7 @@ void fs_private_lib(void) { | |||
392 | char *private_list = cfg.lib_private_keep; | 392 | char *private_list = cfg.lib_private_keep; |
393 | if (arg_debug || arg_debug_private_lib) | 393 | if (arg_debug || arg_debug_private_lib) |
394 | printf("Starting private-lib processing: program %s, shell %s\n", | 394 | printf("Starting private-lib processing: program %s, shell %s\n", |
395 | (cfg.original_program_index > 0)? cfg.original_argv[cfg.original_program_index]: "none", | 395 | (cfg.original_program_index > 0)? cfg.original_argv[cfg.original_program_index]: "none", cfg.usershell); |
396 | (arg_shell_none)? "none": cfg.shell); | ||
397 | 396 | ||
398 | // create /run/firejail/mnt/lib directory | 397 | // create /run/firejail/mnt/lib directory |
399 | mkdir_attr(RUN_LIB_DIR, 0755, 0, 0); | 398 | mkdir_attr(RUN_LIB_DIR, 0755, 0, 0); |
@@ -430,15 +429,15 @@ void fs_private_lib(void) { | |||
430 | } | 429 | } |
431 | } | 430 | } |
432 | 431 | ||
433 | // for the shell | 432 | // Note: this might be used for appimages!!! |
434 | if (!arg_shell_none) { | 433 | // if (!arg_shell_none) { |
435 | if (arg_debug || arg_debug_private_lib) | 434 | // if (arg_debug || arg_debug_private_lib) |
436 | printf("Installing shell libraries\n"); | 435 | // printf("Installing shell libraries\n"); |
437 | 436 | // | |
438 | fslib_install_list(cfg.shell); | 437 | // fslib_install_list(cfg.shell); |
439 | // a shell is useless without some basic commands | 438 | // // a shell is useless without some basic commands |
440 | fslib_install_list("/bin/ls,/bin/cat,/bin/mv,/bin/rm"); | 439 | // fslib_install_list("/bin/ls,/bin/cat,/bin/mv,/bin/rm"); |
441 | } | 440 | // } |
442 | 441 | ||
443 | // for the listed libs and directories | 442 | // for the listed libs and directories |
444 | if (private_list && *private_list != '\0') { | 443 | if (private_list && *private_list != '\0') { |