From 5640faef13bfcda794ea27b565683556a06f3349 Mon Sep 17 00:00:00 2001
From: Doug Burks <doug.burks@gmail.com>
Date: Wed, 12 Aug 2020 16:34:59 -0400
Subject: [PATCH] Kernel consoleblank is causing whiptail progress screen to
 appear to hang #1084

---
 setup/so-setup | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/setup/so-setup b/setup/so-setup
index 1e49b325f..3924e4a8e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -118,7 +118,22 @@ if [ "$OS" == ubuntu ]; then
 	update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
 fi
 
-setterm -blank 0 >> $setup_log 2>&1
+# Kernel consoleblank is causing whiptail progress screen to appear to hang #1084
+# https://github.com/Security-Onion-Solutions/securityonion/issues/1084
+if [ "$automated" == no ]; then
+	TTY=$(tty)
+	echo "Setup is running on TTY $TTY" >> $setup_log 2>&1
+	if echo $TTY | grep -q "/dev/tty"; then 
+		CONSOLEBLANK=$(cat /sys/module/kernel/parameters/consoleblank)
+		echo "Kernel consoleblank value before: $CONSOLEBLANK" >> $setup_log 2>&1
+		if [ $CONSOLEBLANK -gt 0 ]; then 
+			echo "Running 'setterm -blank 0' for TTY $TTY" >> $setup_log 2>&1
+			TERM=linux setterm -blank 0 >$TTY <$TTY
+			CONSOLEBLANK=$(cat /sys/module/kernel/parameters/consoleblank)
+			echo "Kernel consoleblank value after: $CONSOLEBLANK" >> $setup_log 2>&1
+		fi
+	fi
+fi
 
 if [ "$setup_type" == 'iso' ] || (whiptail_you_sure); then
 	true