Proxy whiptail fixes

* Don't try to set up proxy/manager proxy during network only flow
* Fix logic to never show new menu on airgap, set MANAGERUPDATES to 1 on airgap minions
This commit is contained in:
William Wernert
2021-04-19 16:26:53 -04:00
parent 6156e754c4
commit b449955711
3 changed files with 1 additions and 8 deletions

View File

@@ -483,8 +483,6 @@ collect_mtu() {
collect_net_method() {
whiptail_net_method
[[ -z $network_traffic ]] && collect_proxy
if [[ "$network_traffic" == *"_MANAGER" ]]; then
whiptail_manager_updates_warning
MANAGERUPDATES=1

View File

@@ -210,9 +210,6 @@ if ! [[ -f $install_opt_file ]]; then
"HOSTNAME=$HOSTNAME" > "$net_init_file"
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
reset_proxy
collect_net_method
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
whiptail_net_setup_complete
else
true
@@ -428,7 +425,7 @@ fi
if [[ $is_airgap ]]; then
PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-manual}
MANAGERUPDATES=${MANAGERUPDATES:-0}
[[ ! $is_minion ]] && MANAGERUPDATES=${MANAGERUPDATES:-0} || MANAGERUPDATES=${MANAGERUPDATES:-1}
fi
# Start user prompts

View File

@@ -990,8 +990,6 @@ whiptail_management_nic() {
whiptail_net_method() {
[ -n "$TESTING" ] && return
[[ $is_airgap && ! $is_minion ]] && return
local pkg_mngr
if [[ $OS = 'centos' ]]; then pkg_mngr="yum"; else pkg_mngr='apt'; fi