From e881f4c92b9d75e13f5b118a1d927cd6d682fdb0 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Mon, 20 Jul 2020 17:37:46 -0400 Subject: [PATCH] Increment VERSION for dev to 2.1.0-rc.2; Add more logging to troubleshoot automated setup not initiating post-installation steps --- VERSION | 2 +- setup/so-setup | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d0c10bc48..ac97ff772 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-rc.1 \ No newline at end of file +2.1.0-rc.2 \ No newline at end of file diff --git a/setup/so-setup b/setup/so-setup index 6a432fc9d..31f917b16 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -632,6 +632,12 @@ if [[ -n $SO_ERROR ]]; then SKIP_REBOOT=1 whiptail_setup_failed else + echo "Successfully completed setup! Continuing with post-installation steps" >> $setup_log 2>&1 + echo "automated=$automated" >> $setup_log 2>&1 + echo "ALLOW_ROLE=$ALLOW_ROLE" >> $setup_log 2>&1 + echo "ALLOW_CIDR=$ALLOW_CIDR" >> $setup_log 2>&1 + echo "THEHIVE=$THEHIVE" >> $setup_log 2>&1 + { export percentage=95 # set to last percentage used in previous subshell if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then @@ -645,6 +651,7 @@ else } | whiptail_gauge_post_setup "Running post-installation steps..." whiptail_setup_complete + echo "Post-installation steps have completed." >> $setup_log 2>&1 fi install_cleanup >> $setup_log 2>&1