From ca2766511b1cb33574f91ad1ddb8cbfecc25bd6e Mon Sep 17 00:00:00 2001 From: William Wernert Date: Mon, 8 Mar 2021 09:02:53 -0500 Subject: [PATCH] Revert "[wip] Change when proxy is set up so main ip is known" This reverts commit 1ea3cb1c615fc876b1429ada48bca2c81f62ecd7. # Conflicts: # setup/so-functions --- setup/so-functions | 6 ++---- setup/so-setup | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index a85ab1982..7951430db 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -795,7 +795,7 @@ compare_main_nic_ip() { error "[ERROR] Main gateway ($MAINIP) does not match ip address of managament NIC ($MNIC_IP)." read -r -d '' message <<- EOM - The IP being routed by Linux is not the IP address assigned to the management interface ($MNIC). + The IP being routed by Linux is not the IP address assigned to the management interface ($MNIC). This is not a supported configuration, please remediate and rerun setup. EOM @@ -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 diff --git a/setup/so-setup b/setup/so-setup index c7ebddd78..dd98d1730 100755 --- a/setup/so-setup +++ b/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