X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=3b057957ea9ae71a7465f6addc60f881ea8c4920;hb=da61a304a10de72288782a9d872769fe44576f50;hp=4009ede6e37a081ab7da6d631dd25c69da5534e1;hpb=99439572819ac875b329189d7b9162a5bb8bc805;p=automated-distro-installer diff --git a/fai-revm b/fai-revm index 4009ede..3b05795 100755 --- a/fai-revm +++ b/fai-revm @@ -17,10 +17,9 @@ -cleanup() { :; } -set -eE -o pipefail -trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR -script_dir=$(dirname $(readlink -f "$BASH_SOURCE")) +x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace" + +script_dir="$(readlink -f "$BASH_SOURCE")" e() { echo "$*"; "$@"; } @@ -82,6 +81,8 @@ cleanup() { ./pxe-server ./faiserver-disable } +_errcatch_cleanup=cleanup + if is_arch_revm; then ./pxe-server demohost arch sleep 2 @@ -133,7 +134,7 @@ sleep 30 while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do e sleep 5 done -cleanup() { :; } +unset _errcatch_cleanup e pxe-server if is_arch_revm; then ./arch-init-remote $name