mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-28 22:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ssh verboseness spew.

Browse Source 
This CL removes verboseness when running ssh commands through
remote_access.sh while preserving the retry.

BUG=chromium-os:20985
TEST=Ran image_to_live.

Change-Id: I26bc5189f369dc2305442755a266b80b27aa2ed7
Reviewed-on: https://gerrit.chromium.org/gerrit/16856
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
This commit is contained in:
Chris Sosa 2012-02-27 14:46:10 -08:00 committed by Gerrit
parent 650bf873cd
commit 539b341dec
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
remote_access.sh
View File

@ -33,14 +33,7 @@ function remote_rsync_from() {
--no-R --files-from=$1 root@${FLAGS_remote}:/ $2 --no-R --files-from=$1 root@${FLAGS_remote}:/ $2
} }
function _verbose_remote_sh() { function _remote_sh() {
REMOTE_OUT=$(ssh -vp ${FLAGS_ssh_port} $SSH_CONNECT_SETTINGS \
-o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY \
root@$FLAGS_remote "$@")
return ${PIPESTATUS[0]}
}
function _non_verbose_remote_sh() {
REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} $SSH_CONNECT_SETTINGS \ REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} $SSH_CONNECT_SETTINGS \
-o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY \ -o UserKnownHostsFile=$TMP_KNOWN_HOSTS -i $TMP_PRIVATE_KEY \
root@$FLAGS_remote "$@") root@$FLAGS_remote "$@")
@ -48,13 +41,13 @@ function _non_verbose_remote_sh() {
} }
# Wrapper for ssh that runs the commmand given by the args on the remote host # Wrapper for ssh that runs the commmand given by the args on the remote host
# If an ssh error occurs, re-runs the ssh command with verbose flag set. # If an ssh error occurs, re-runs the ssh command.
function remote_sh() { function remote_sh() {
local ssh_status=0 local ssh_status=0
_non_verbose_remote_sh "$@" || ssh_status=$? _remote_sh "$@" || ssh_status=$?
# 255 indicates an ssh error. # 255 indicates an ssh error.
if [ ${ssh_status} -eq 255 ]; then if [ ${ssh_status} -eq 255 ]; then
_verbose_remote_sh "$@" _remote_sh "$@"
else else
return ${ssh_status} return ${ssh_status}
fi fi