Merge remote-tracking branch 'remotes/origin/dev' into issue/3264

setup/so-functions

@@ -1792,6 +1792,16 @@ reserve_group_ids() {
 	groupadd -g 946 cyberchef
 }
 
+reserve_ports() {
+	# These are also set via salt but need to be set pre-install to avoid conflicts before salt runs
+	if ! sysctl net.ipv4.ip_local_reserved_ports | grep 55000 | grep 57314; then
+		echo "Reserving ephemeral ports used by Security Onion components to avoid collisions"
+		sysctl -w net.ipv4.ip_local_reserved_ports="55000,57314"
+	else
+		echo "Ephemeral ports already reserved"
+	fi
+}
+
 reinstall_init() {
 	info "Putting system in state to run setup again"
 	

setup/so-setup

@@ -550,6 +550,8 @@ set_redirect >> $setup_log 2>&1
 	# Show initial progress message
 	set_progress_str 0 'Running initial configuration steps'
 
+	reserve_ports
+	
 	set_path
 
 	if [[ $is_reinstall ]]; then

setup/so-whiptail

@@ -631,11 +631,23 @@ whiptail_invalid_hostname() {
 whiptail_log_size_limit() {
 
 	[ -n "$TESTING" ] && return
-	
 
-	log_size_limit=$(whiptail --title "Security Onion Setup" --inputbox \
-	"Please specify the amount of disk space (in GB) you would like to allocate for Elasticsearch data storage: \n\
-	By default, this is set to 80% of the disk space allotted for /nsm." 10 75 "$1" 3>&1 1>&2 2>&3)
+	case $install_type in
+		STANDALONE | EVAL | HEAVYNODE)
+			percentage=50
+		;;
+		*)
+			percentage=80
+		;;
+	esac
+
+	read -r -d '' message <<- EOM
+	Please specify the amount of disk space (in GB) you would like to allocate for Elasticsearch data storage.
+
+	By default, this is set to ${percentage}% of the disk space allotted for /nsm.
+	EOM
+	
+	log_size_limit=$(whiptail --title "Security Onion Setup" --inputbox "$message" 11 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus