diff options
author | 2016-09-02 22:56:15 +0300 | |
---|---|---|
committer | 2016-09-02 22:56:15 +0300 | |
commit | 8d999823e793a38306bccd264f089b5faa203aae (patch) | |
tree | dae7d4981afd3d24750dce10d4536c38301e5269 | |
parent | Merge pull request #755 from Fred-Barclay/fixes (diff) | |
download | firejail-8d999823e793a38306bccd264f089b5faa203aae.tar.gz firejail-8d999823e793a38306bccd264f089b5faa203aae.tar.zst firejail-8d999823e793a38306bccd264f089b5faa203aae.zip |
fix --join-network and --join-filesystem
-rw-r--r-- | src/firejail/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 391e86907..501bccff2 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -607,6 +607,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
607 | exit(1); | 607 | exit(1); |
608 | } | 608 | } |
609 | 609 | ||
610 | if (!cfg.shell && !arg_shell_none) | ||
611 | cfg.shell = guess_shell(); | ||
612 | |||
610 | // join sandbox by pid or by name | 613 | // join sandbox by pid or by name |
611 | pid_t pid; | 614 | pid_t pid; |
612 | if (read_pid(argv[i] + 15, &pid) == 0) | 615 | if (read_pid(argv[i] + 15, &pid) == 0) |
@@ -630,6 +633,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
630 | exit(1); | 633 | exit(1); |
631 | } | 634 | } |
632 | 635 | ||
636 | if (!cfg.shell && !arg_shell_none) | ||
637 | cfg.shell = guess_shell(); | ||
638 | |||
633 | // join sandbox by pid or by name | 639 | // join sandbox by pid or by name |
634 | pid_t pid; | 640 | pid_t pid; |
635 | if (read_pid(argv[i] + 18, &pid) == 0) | 641 | if (read_pid(argv[i] + 18, &pid) == 0) |