Revert "[wip] Change when proxy is set up so main ip is known"

This reverts commit 1ea3cb1c61.

# Conflicts:
#	setup/so-functions

setup/so-functions

@@ -1743,8 +1743,6 @@ network_init() {
 	if [[ "$setup_type" == 'iso' ]]; then
 		set_management_interface
 	fi
-	set_main_ip >> $setup_log 2>&1
-	compare_main_nic_ip
 }
 
 network_init_whiptail() {
@@ -2295,7 +2293,7 @@ set_proxy() {
 		"Environment=\"NO_PROXY=${no_proxy_string}\"" > /etc/systemd/system/docker.service.d/http-proxy.conf
 
 	systemctl daemon-reload
-	command -v docker &> /dev/null && systemctl restart docker
+	systemctl restart docker
 
 	# Create config.json for docker containers
 	[[ -d /root/.docker ]] || mkdir /root/.docker

setup/so-setup

@@ -545,7 +545,9 @@ catch() {
 	exit
 }
 
-# Set REDIRECTIT variable, which is used by a function outside the below subshell
+# This block sets REDIRECTIT which is used by a function outside the below subshell
+set_main_ip >> $setup_log 2>&1
+compare_main_nic_ip
 set_redirect >> $setup_log 2>&1
 [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1