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

setup/so-functions

@@ -753,6 +753,14 @@ disable_auto_start() {
 	fi
 }
 
+disable_ipv6() {
+	{
+		info "Disabling ipv6"
+		sysctl -w net.ipv6.conf.all.disable_ipv6=1
+		sysctl -w net.ipv6.conf.default.disable_ipv6=1
+	}  >> "$setup_log" 2>&1
+}
+
 disable_misc_network_features() {
 	filter_unused_nics
 	if [ ${#filtered_nics[@]} -ne 0 ]; then

setup/so-setup

@@ -138,7 +138,7 @@ if [ "$automated" == no ]; then
 	fi
 fi
 
-if [ "$setup_type" == 'iso' ] || (whiptail_you_sure); then
+if (whiptail_you_sure); then
 	true
 else
 	echo "User cancelled setup." | tee $setup_log
@@ -423,9 +423,9 @@ if [[ "$setup_type" == 'iso' ]]; then
 	set_management_interface
 fi
 
+disable_ipv6
 disable_auto_start
 
-
 {
 	set_hostname;
 	set_version;