diff --git a/setup/so-setup b/setup/so-setup
index 1ea238a38..8ee236bf1 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -437,6 +437,26 @@ catch() {
 	exit
 }
 
+# Init networking so rest of install works
+if [[ -n "$TURBO" ]]; then
+	use_turbo_proxy
+fi
+
+if [[ "$setup_type" == 'iso' ]]; then
+	set_hostname >> $setup_log 2>&1
+	set_management_interface
+fi
+
+disable_ipv6
+
+if [[ "$setup_type" != 'iso' ]]; then
+	set_hostname >> $setup_log 2>&1
+fi
+
+if [[ $is_minion ]]; then
+	add_mngr_ip_to_hosts
+fi
+
 # This block sets REDIRECTIT which is used by a function outside the below subshell
 {
 	set_main_ip;
@@ -457,27 +477,8 @@ catch() {
 		reinstall_init
 	fi
 
-	if [[ -n "$TURBO" ]]; then
-		use_turbo_proxy
-	fi
-
-	if [[ "$setup_type" == 'iso' ]]; then
-		# Init networking so rest of install works
-		set_hostname >> $setup_log 2>&1
-		set_management_interface
-	fi
-
-	disable_ipv6
 	disable_auto_start
 
-	if [[ "$setup_type" != 'iso' ]]; then
-		set_hostname >> $setup_log 2>&1
-	fi
-
-	if [[ $is_minion ]]; then
-		add_mngr_ip_to_hosts
-	fi
-
 	{
 		mark_version;
 		clear_manager;