Merge pull request #1958 from Security-Onion-Solutions/feat/require-min-nics

Feat/require min nics

setup/so-functions

@@ -498,13 +498,22 @@ check_requirements() {
 	fi
 
 	if [[ $num_nics -lt $req_nics ]]; then
+		if [[ $num_nics -eq 1 ]]; then
+			whiptail_requirements_error "NIC" "$num_nics" "$req_nics"
+		else
 			whiptail_requirements_error "NICs" "$num_nics" "$req_nics"
 		fi
+	fi
 
 	if [[ $num_cpu_cores -lt $req_cores ]]; then
+		if [[ $num_cpu_cores -eq 1 ]]; then
+			whiptail_requirements_error "core" "$num_cpu_cores" "$req_cores"
+		else
 			whiptail_requirements_error "cores" "$num_cpu_cores" "$req_cores"
 		fi
 		
+	fi
+	
 	if [[ $total_mem_hr -lt $req_mem ]]; then
 		whiptail_requirements_error "memory" "${total_mem_hr} GB" "${req_mem} GB"
 	fi

setup/so-whiptail

@@ -340,11 +340,27 @@ whiptail_requirements_error() {
 
 	[ -n "$TESTING" ] && return
 
+	if [[ $(echo "$requirement_needed" | tr '[:upper:]' '[:lower:]') == 'nics' ]]; then
+		whiptail --title "Security Onion Setup" \
+			--msgbox "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Press OK to exit setup and reconfigure the machine."  10 75
+		
+		# Same as whiptail_cancel, but changed the wording to exit instead of cancel.
+		whiptail --title "Security Onion Setup" --msgbox "Exiting Setup. No changes have been made." 8 75
+		if [ -d "/root/installtmp" ]; then
+			{
+				echo "/root/installtmp exists";
+				install_cleanup;
+				echo "/root/installtmp removed";
+			} >> $setup_log 2>&1
+		fi
+		exit
+	else
 		whiptail --title "Security Onion Setup" \
 			--yesno "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Press YES to continue anyway, or press NO to cancel."  10 75
 
 		local exitstatus=$?
 		whiptail_check_exitstatus $exitstatus
+	fi
 }
 
 whiptail_storage_requirements() {