From 67582be5758c969661ebbbc39a190e001b84732b Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 29 Mar 2022 17:23:38 -0400
Subject: [PATCH] Set standalone to load Xwindows

---
 setup/so-setup    | 5 +----
 setup/so-whiptail | 9 +++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 6aa95c0e6..ca3403bee 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -95,10 +95,7 @@ if [[ $is_analyst ]]; then
 	    exit 1
 	fi
 
-    whiptail_analyst_install
-	echo "$AWORK"
-
-	if [[ $AWORK != "Join" ]]; then
+    if ! whiptail_analyst_install; then
 	    # Lets make this a standalone
 		echo "Enabling X Windows and setting it to load at boot"
 		systemctl set-default graphical.target
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 2c6b7092b..f028af323 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -41,12 +41,13 @@ whiptail_analyst_install() {
 	
 	Welcome to the Security Onion Analyst Workstation install!
 
-	You can choose to join this workstation to an existing grid for managemnt or make it standalone.
+	You can choose to join this workstation to an existing grid?
+
+	NOTE: Selecting "no" will enable X Windows and set it to load at boot.
 	EOM
     echo "whiptail"
-	AWORK=$(whiptail --title "$whiptail_title" \
-		--yesno "$message" 11 75 \
-		--yes-button "Join" --no-button "Standalone" --defaultno 3>&1 1>&2 2>&3 )
+	whiptail --title "$whiptail_title" \
+		--yesno "$message" 11 75 --defaultno
 
 }