From eeb0579acb00a0404b0e694faa38558aa6078b3b Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Fri, 15 May 2020 10:42:52 -0400
Subject: [PATCH] [fix] Don't change settings during whiptail menus on ISO

---
 setup/so-setup | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 0803ceff1..1c08796ac 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -116,13 +116,7 @@ case "$setup_type" in
 			whiptail_management_interface_dns_search
 		fi
 
-		# Init networking so rest of install works
-		set_hostname_iso
-		set_management_interface
-
 		collect_adminuser_inputs
-		add_admin_user
-		disable_onion_user
 		;;
 	'network')
 		whiptail_network_notice
@@ -247,6 +241,15 @@ fi
 
 whiptail_make_changes
 
+if [[ "$setup_type" == 'iso' ]]; then
+	# Init networking so rest of install works
+	set_hostname_iso
+	set_management_interface
+
+	add_admin_user
+	disable_onion_user
+fi
+
 set_hostname 2>> "$setup_log"
 set_version 2>> "$setup_log"
 clear_master 2>> "$setup_log"