Revert "remote_access.sh: remove dependence on ssh-agent"

remote_access.sh

 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Library for setting up remote access and running remote commands.
 
 DEFAULT_PRIVATE_KEY="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts/\
 ssh_keys/testing_rsa"
 
 DEFINE_string remote "" "remote hostname/IP of running Chromium OS instance"
 DEFINE_string private_key "$DEFAULT_PRIVATE_KEY" \
   "Private key of root account on remote host"
 DEFINE_integer ssh_port 22 \
   "SSH port of the remote machine running Chromium OS instance"
 
 # Copies $1 to $2 on remote host
 function remote_cp_to() {
-  REMOTE_OUT=$(scp -P ${FLAGS_ssh_port} -o StrictHostKeyChecking=no \
-    -o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY $1 \
-    root@$FLAGS_remote:$2)
+  REMOTE_OUT=$(scp -P ${FLAGS_ssh_port} -o StrictHostKeyChecking=no -o \
+    UserKnownHostsFile=$TMP_KNOWN_HOSTS $1 root@$FLAGS_remote:$2)
   return ${PIPESTATUS[0]}
 }
 
 # Copies a list of remote files specified in file $1 to local location
 # $2.  Directory paths in $1 are collapsed into $2.
 function remote_rsync_from() {
-  rsync -e "ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no \
-             -o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY" \
-    --no-R --files-from=$1 root@${FLAGS_remote}:/ $2
+  rsync -e "ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no -o \
+            UserKnownHostsFile=$TMP_KNOWN_HOSTS" --no-R \
+    --files-from=$1 root@${FLAGS_remote}:/ $2
 }
 
 function remote_sh() {
-  REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no \
-    -o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY \
-    root@$FLAGS_remote "$@")
+  REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no -o \
+    UserKnownHostsFile=$TMP_KNOWN_HOSTS root@$FLAGS_remote "$@")
   return ${PIPESTATUS[0]}
 }
 
 function remote_sh_allow_changed_host_key() {
   rm -f $TMP_KNOWN_HOSTS
   remote_sh "$@"
 }
 
 function set_up_remote_access() {
+  if [ -z "$SSH_AGENT_PID" ]; then
+    eval $(ssh-agent)
+    OWN_SSH_AGENT=1
+  else
+    OWN_SSH_AGENT=0
+  fi
   cp $FLAGS_private_key $TMP_PRIVATE_KEY
   chmod 0400 $TMP_PRIVATE_KEY
+  ssh-add $TMP_PRIVATE_KEY
 
   # Verify the client is reachable before continuing
   echo "Initiating first contact with remote host"
   remote_sh "true"
   echo "Connection OK"
 }
 
 # Ask the target what board it is
 function learn_board() {
   [ -n "${FLAGS_board}" ] && return
@@ skipping 72 matching lines @@
 
 function remote_access_init() {
   TMP_PRIVATE_KEY=$TMP/private_key
   TMP_KNOWN_HOSTS=$TMP/known_hosts
   if [ -z "$FLAGS_remote" ]; then
     echo "Please specify --remote=<IP-or-hostname> of the Chromium OS instance"
     exit 1
   fi
   set_up_remote_access
 }