diff options
Diffstat (limited to 'rapid-tunneling')
-rwxr-xr-x | rapid-tunneling | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/rapid-tunneling b/rapid-tunneling index f015960..a7ff91f 100755 --- a/rapid-tunneling +++ b/rapid-tunneling @@ -11,6 +11,7 @@ usage() { echo >&2 " $me [options] remote-access-NAME.tar.gz" echo >&2 "" echo >&2 "Options:" + echo >&2 " -D Don't daemonize" echo >&2 " -h HOST Connect to HOST rather the host from the tarball" echo >&2 " -p PORT Connect to PORT rather the host from the tarball" echo >&2 " -u USER Connect to USER rather the host from the tarball" @@ -27,9 +28,12 @@ if [ -r /etc/rapid-tunneling/client ]; then . /etc/rapid-tunneling/client; fi opt_host='' opt_port='' opt_user='' +opt_daemonize='yes' -while getopts b:h:p:u: opt; do +while getopts dDh:p:u: opt; do case "$opt" in + D) opt_daemonize='no';; + d) opt_daemonize='yes';; h) opt_host="$OPTARG";; p) opt_port="$OPTARG";; u) opt_user="$OPTARG";; @@ -67,5 +71,10 @@ if [ -x /sbin/start-stop-daemon ]; then else SSD="/sbin/busybox start-stop-daemon" fi +if [ "$opt_daemonize" = 'yes' ]; then + SSD_CMD="$SSD -S -b -m -p $base_dir/pid -x /bin/sh -- -c" +else + SSD_CMD="/bin/sh -c" +fi -$SSD -S -b -m -p $base_dir/pid -x /bin/sh -- -c "exec env SSH_AUTH_SOCK= ssh -o 'StrictHostKeyChecking no' -o 'BatchMode yes' -o 'ServerAliveInterval 60' -T -p $port -i $base_dir/key -R $tunnelport:127.0.0.1:22 -l $user $host < $base_dir/ra-params.tar.gz" +$SSD_CMD "exec env SSH_AUTH_SOCK= ssh -o 'StrictHostKeyChecking no' -o 'BatchMode yes' -o 'ServerAliveInterval 60' -T -p $port -i $base_dir/key -R $tunnelport:127.0.0.1:22 -l $user $host < $base_dir/ra-params.tar.gz" |