From 73a1bdd885f7943ee52538e025282dcc736101fa Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Mon, 12 Apr 2021 12:59:45 -0400
Subject: [PATCH] Send stdout to log, and actually populate error message

---
 setup/so-functions | 2 +-
 setup/so-whiptail  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 604eb56b7..5f07bb3b0 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -164,7 +164,7 @@ check_hive_init() {
 
 check_manager_state() {
 	echo "Checking state of manager services. This may take a moment..."
-	retry 2 15 "__check_so_status" && retry 2 15 "__check_salt_master" && return 0 || return 1
+	retry 2 15 "__check_so_status" >> $setup_log 2>&1 && retry 2 15 "__check_salt_master" >> $setup_log 2>&1 && return 0 || return 1
 }
 
 __check_so_status() {
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 50b50e353..6ce2c214c 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1147,7 +1147,7 @@ whiptail_manager_adv_service_zeeklogs() {
 
 whiptail_manager_error() {
 	local msg
-	read -r -d '' <<- EOM
+	read -r -d '' msg <<- EOM
 	Setup could not determine if the manager $MSRV is in a good state.
 
 	Continuing without verifying all services on the manager are running may result in a failure.