From 4a59c96463e66175909d9190f8203efa92818c00 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 27 Apr 2021 18:10:40 +0000 Subject: [PATCH] vagrant: Ensure the whats_next message is printed at the end The tinkerbell.sh script ends up doing some other work after calling setup.sh and has set -x enabled so the whats_next message is likely to be missed. So now save it for later reading as the last thing done. Signed-off-by: Manuel Mendez --- deploy/vagrant/scripts/tinkerbell.sh | 3 +++ setup.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/vagrant/scripts/tinkerbell.sh b/deploy/vagrant/scripts/tinkerbell.sh index 66b005a..915f27f 100644 --- a/deploy/vagrant/scripts/tinkerbell.sh +++ b/deploy/vagrant/scripts/tinkerbell.sh @@ -51,6 +51,9 @@ main() ( secure_certs configure_vagrant_user + + set +x # don't want the stderr output from xtrace messing with the post-setup-message + [[ -f /tmp/post-setup-message ]] && cat /tmp/post-setup-message ) main diff --git a/setup.sh b/setup.sh index 50e0621..59da9aa 100755 --- a/setup.sh +++ b/setup.sh @@ -503,7 +503,7 @@ do_setup() ( setup_docker_registry echo "$INFO tinkerbell stack setup completed successfully on $lsb_dist server" - whats_next + whats_next | tee /tmp/post-setup-message ) # wrapped up in a function so that we have some protection against only getting