Merge pull request #10779 from Security-Onion-Solutions/palletethings

Palletethings

salt/common/tools/sbin/so-common

@@ -417,7 +417,7 @@ set_minionid() {
 }
 
 set_palette() {
-	if [[ $is_ubuntu ]]; then
+	if [[ $is_deb ]]; then
 	    update-alternatives --set newt-palette /etc/newt/palette.original
     fi
 }

setup/so-setup

@@ -64,12 +64,25 @@ done
 
 # Let's see what OS we are dealing with here
 detect_os
+
+# Ubuntu/Debian whiptail pallete to make it look the same as CentOS and Rocky.
+set_palette >> $setup_log 2>&1
+
 if [[ $not_supported ]]; then
-	if (whiptail_unsupported_os_warning); then
+	if [[ "$OSVER" == "focal" ]]; then
-		true
+		if (whiptail_focal_warning); then
+			true
+		else
+			info "User cancelled setup."
+			whiptail_cancel
+		fi
 	else
-		info "User cancelled setup."
+		if (whiptail_unsupported_os_warning); then
-		whiptail_cancel
+			true
+		else
+			info "User cancelled setup."
+			whiptail_cancel
+		fi
 	fi
 fi
 
@@ -255,9 +268,6 @@ local_sbin="$(pwd)/../salt/common/tools/sbin"
 manager_sbin="$(pwd)/../salt/manager/tools/sbin"
 export PATH=$PATH:$local_sbin:$manager_sbin
 
-# Ubuntu/Debian whiptail pallete to make it look the same as CentOS and Rocky.
-set_palette >> $setup_log 2>&1
-
 # Kernel messages can overwrite whiptail screen #812
 # https://github.com/Security-Onion-Solutions/securityonion/issues/812
 dmesg -D

setup/so-whiptail

@@ -455,6 +455,28 @@ __append_end_msg() {
 	EOM
 }
 
+whiptail_focal_warning() {
+
+	[ -n "$TESTING" ] && return
+
+	read -r -d '' focal_warning_continue <<- EOM
+
+	WARNING: Ubuntu 20.04 is only supported as a minion role.
+
+	This node may not install or operate as expected if installed
+	as a manager, managersearch, standalone, eval, or import.
+
+	Would you like to continue the install?
+
+	EOM
+	whiptail --title "$whiptail_title" \
+		--yesno "$focal_warning_continue" 14 75 --defaultno
+
+	local exitstatus=$?
+	return $exitstatus
+
+}
+
 whiptail_gauge_post_setup() {
 
 	if [ -n "$TESTING" ]; then