mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 05:26:58 +02:00
d5d5dbffa1
The problem here is that most were doing their exiting w/in a subshell; exit within a subshell kills the subshell, not the parent. Not all scripts were using set -e (which would pick up the failing subshell); as such just rewriting them to remove the potential via eliminateing the subshelling. Beyond that, removed a couple of custom (working, although non-standard) approaches, and removed a duplicate common.sh sourc'ing w/in mk_memento_images.sh TEST=force 'find_common_sh' to fail, note the scripts fails to exit BUG=none Change-Id: Ia1108a091a6399ad6aedd3cade4a107f4411686c Reviewed-on: http://gerrit.chromium.org/gerrit/3905 Reviewed-by: Brian Harring <ferringb@chromium.org> Tested-by: Brian Harring <ferringb@chromium.org>
55 lines
1.3 KiB
Bash
Executable File
55 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Copyright (c) 2010 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.
|
|
|
|
# Run remote access test to ensure ssh access to a host is working. Exits with
|
|
# a code of 0 if successful and non-zero otherwise. Used by test infrastructure
|
|
# scripts.
|
|
|
|
# --- BEGIN COMMON.SH BOILERPLATE ---
|
|
# Load common CrOS utilities. Inside the chroot this file is installed in
|
|
# /usr/lib/crosutils. Outside the chroot we find it relative to the script's
|
|
# location.
|
|
find_common_sh() {
|
|
local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
|
|
local path
|
|
|
|
SCRIPT_ROOT=
|
|
for path in "${common_paths[@]}"; do
|
|
if [ -r "${path}/common.sh" ]; then
|
|
SCRIPT_ROOT=${path}
|
|
break
|
|
fi
|
|
done
|
|
}
|
|
|
|
find_common_sh
|
|
. "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
|
|
# --- END COMMON.SH BOILERPLATE ---
|
|
|
|
. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"
|
|
|
|
function cleanup {
|
|
cleanup_remote_access
|
|
rm -rf "${TMP}"
|
|
}
|
|
|
|
function main() {
|
|
cd "${SCRIPTS_DIR}"
|
|
|
|
FLAGS "$@" || exit 1
|
|
eval set -- "${FLAGS_ARGV}"
|
|
|
|
set -e
|
|
|
|
trap cleanup EXIT
|
|
|
|
TMP=$(mktemp -d /tmp/ssh_test.XXXX)
|
|
|
|
remote_access_init
|
|
}
|
|
|
|
main $@
|