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

setup/so-functions

@@ -998,7 +998,9 @@ parse_options() {
 			export {https,ftp,rsync,all}_proxy="$http_proxy"
 			;;
 		*)
-			echo "Invalid option"
+			if  [[ $1 = --* ]]; then
+				echo "Invalid option"
+			fi
 	esac
 }
 

setup/so-setup

@@ -33,6 +33,8 @@ echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1
 function progress() {
 	if [ $automated == no ]; then
 		whiptail --title "Security Onion Install" --gauge 'Please wait while installing' 6 60 0
+	else
+		cat >> $setup_log 2>&1
 	fi
 }
 
@@ -236,6 +238,9 @@ fi
 
 if [[ $is_distmaster || ( $is_sensor || $is_node ) && ! $is_eval ]]; then
 	whiptail_master_updates
+	if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then
+		whiptail_master_updates_warning
+	fi
 fi
 
 if [[ $is_minion ]]; then

setup/so-whiptail

@@ -1027,7 +1027,17 @@ whiptail_master_updates() {
 			;;
 	esac
 
+}
 
+whiptail_master_updates_warning() {
+	[ -n "$TESTING" ] && return
+
+	whiptail --title "Security Onion Setup"\
+	--msgbox "Updating through the master node requires the master to have internet access, press ENTER to continue"\
+	8 75
+
+	local exitstatus=$?
+	whiptail_check_exitstatus $exitstatus
 }
 
 whiptail_node_updates() {