Merge pull request #763 from manevich/join

small fixes

2 files changed, 9 insertions, 3 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) {
                                 exit(1);
                         }
                         
+                        if (!cfg.shell && !arg_shell_none)
+                                cfg.shell = guess_shell();
+
                         // join sandbox by pid or by name
                         pid_t pid;
                         if (read_pid(argv[i] + 15, &pid) == 0)          
@@ -630,6 +633,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         exit(1);
                 }
                 
+                if (!cfg.shell && !arg_shell_none)
+                        cfg.shell = guess_shell();
+
                 // join sandbox by pid or by name
                 pid_t pid;
                 if (read_pid(argv[i] + 18, &pid) == 0)          
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 35b84b981..dbb0df233 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -578,19 +578,19 @@ $ firejail --net=eth0 --name=browser firefox &
 .br
 # change netfilter configuration
 .br
-$ sudo firejail --join-network=browser "cat /etc/firejail/nolocal.net | /sbin/iptables-restore"
+$ sudo firejail --join-network=browser bash -c "cat /etc/firejail/nolocal.net | /sbin/iptables-restore"
 .br
 
 .br
 # verify netfilter configuration
 .br
-$ sudo firejail --join-network=browser "/sbin/iptables -vL"
+$ sudo firejail --join-network=browser /sbin/iptables -vL
 .br
 
 .br
 # verify  IP addresses
 .br
-$ sudo firejail --join-network=browser "ip addr"
+$ sudo firejail --join-network=browser ip addr
 .br
 Switching to pid 1932, the first child process inside the sandbox
 .br