From 6e3d951b0115bca4db7838071c2e2d56d8fef3ee Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 17 Mar 2021 20:17:23 -0400 Subject: [PATCH] [fix] Show message in terminal when restarting Docker to avoid confusion --- setup/so-functions | 2 +- setup/so-setup | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 82da7c98d..61ae9ceee 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1938,7 +1938,7 @@ reset_proxy() { [[ -f /etc/systemd/system/docker.service.d/http-proxy.conf ]] && rm -f /etc/systemd/system/docker.service.d/http-proxy.conf systemctl daemon-reload - command -v docker &> /dev/null && systemctl restart docker + command -v docker &> /dev/null && echo "Restarting Docker..." && systemctl restart docker [[ -f /root/.docker/config.json ]] && rm -f /root/.docker/config.json diff --git a/setup/so-setup b/setup/so-setup index de0ffefd4..6c77fcd5e 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -211,7 +211,7 @@ if ! [[ -f $install_opt_file ]]; then "HOSTNAME=$HOSTNAME" > "$net_init_file" set_main_ip >> $setup_log 2>&1 compare_main_nic_ip - reset_proxy >> $setup_log 2>&1 + reset_proxy collect_proxy [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1 whiptail_net_setup_complete @@ -298,7 +298,6 @@ if ! [[ -f $install_opt_file ]]; then source "$net_init_file" fi - if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then network_init fi @@ -310,7 +309,7 @@ if ! [[ -f $install_opt_file ]]; then collect_mngr_hostname fi - reset_proxy >> $setup_log 2>&1 + reset_proxy if [[ -z $is_airgap ]]; then collect_proxy [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1