integrate-distro.sh: Use CVS_RSH or GIT_SSH to ssh into localhost

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-26 07:27:02 +00:00
commit 3fd044c974
2 changed files with 8 additions and 4 deletions

View file

@ -1479,7 +1479,13 @@ if [ `whoami` != root -o "$l32" ]; then
opts=""
[ "$config_file" ] && opts="$opts --config-file $config_file"
#debug="/bin/bash -x"
ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
ssh=ssh
[ "$CVS_RSH" ] && ssh="$CVS_RSH"
[ "$GIT_SSH" ] && ssh="$GIT_SSH"
ssh=`which $ssh`
[ -x "$ssh" ] || fatal "SSH executable \"$ssh\" not found"
$ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
exit $?
fi