From f9633e72871307de621fadc86e49f0eade5dfea8 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 11 Apr 2022 14:51:17 -0400
Subject: [PATCH] Add more whiptail menus

---
 setup/so-functions |  1 -
 setup/so-setup     | 21 +++++++++++++++------
 setup/so-whiptail  | 37 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 26b6b640e..63da982a3 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -147,7 +147,6 @@ analyst_salt_local() {
 	# Install salt
 	logCmd "yum -y install salt-minion-3004.1 httpd-tools python3 python36-docker python36-dateutil python36-m2crypto python36-mysql python36-packaging python36-lxml yum-utils device-mapper-persistent-data lvm2 openssl jq"
 	logCmd "yum -y update --exclude=salt*"
-	logCmd "systemctl enable salt-minion"
 
 	salt-call state.apply workstation --local --file-root=../salt/ -l info 2>&1 | tee -a outfile
 	echo "Whiptail to reboot here"
diff --git a/setup/so-setup b/setup/so-setup
index 03a861e44..46f95b3e3 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -101,13 +101,22 @@ if [[ $is_analyst ]]; then
 
 	if ! whiptail_analyst_install; then
 		if [[ $is_analyst_iso ]]; then
-			# Lets make this a standalone
-			echo "Enabling graphical interface and setting it to load at boot"
-			systemctl set-default graphical.target
-			startx
-			exit 0
+			if whiptail_analyst_nongrid_iso; then
+				echo "Enabling graphical interface and setting it to load at boot"
+				systemctl set-default graphical.target
+				startx
+				exit 0
+			else
+				# Abort!
+				exit 0
+			fi
 		else
-			analyst_salt_local
+			if whiptail_analyst_nongrid_network; then
+				analyst_salt_local
+			else
+				# Abort!
+				exit 0
+			fi
 		fi
 	fi
 
diff --git a/setup/so-whiptail b/setup/so-whiptail
index b25ab0fbc..b4e954b85 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -43,7 +43,42 @@ whiptail_analyst_install() {
 
 	Would you like to join this workstation to an existing grid?
 
-	NOTE: Selecting "no" will enable X Windows and set it to load at boot.
+	EOM
+	whiptail --title "$whiptail_title" \
+		--yesno "$message" 11 75 --defaultno
+
+}
+
+whiptail_analyst_nongrid_iso() {
+
+	[ -n "$TESTING" ] && return
+
+	read -r -d '' message <<- EOM
+	
+	You have selected this Analyst workstation to be independant.
+
+	Would you still like to have the graphical interface loaded at boot?
+
+	NOTE: Selecting no will exit without making changes.
+
+	EOM
+	whiptail --title "$whiptail_title" \
+		--yesno "$message" 11 75 --defaultno
+
+}
+
+whiptail_analyst_nongrid_network() {
+
+	[ -n "$TESTING" ] && return
+
+	read -r -d '' message <<- EOM
+	
+	You have selected this Analyst workstation to be independant.
+
+	Would you still like to install and load the graphical interface?
+
+	NOTE: Selecting no will exit without making changes.
+
 	EOM
 	whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 --defaultno