From f058fb460dda73f76c79a3eefa1960bf1fa06874 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 5 Nov 2020 13:25:02 -0500
Subject: [PATCH] [fix] Don't modify hosts file during whiptail menus

---
 setup/so-functions | 8 ++++++--
 setup/so-setup     | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 993cf5751..f764071cc 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -103,9 +103,13 @@ add_manager_hostfile() {
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
+}
 
-	# Add manager to hosts file
-	echo "$MSRVIP   $MSRV" >> /etc/hosts
+
+add_mngr_ip_to_hosts() {
+	if [[ -n "$MSRVIP" ]]; then
+		echo "$MSRVIP   $MSRV" >> /etc/hosts
+	fi
 }
 
 addtotab_generate_templates() {
diff --git a/setup/so-setup b/setup/so-setup
index c8c6dcdb2..cf180000f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -446,7 +446,11 @@ disable_ipv6
 disable_auto_start
 
 if [[ "$setup_type" != 'iso' ]]; then
-	set_hostname >> $setup_log 2>&1
+	set_hostname
+fi
+
+if [[ $is_minion ]]; then
+	add_mngr_ip_to_hosts
 fi
 
 {