From 8c454973ad606eb95da00c6433de28daa302158d Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 17 Nov 2021 08:42:27 -0500 Subject: [PATCH] Run `check_network_manager_conf()` later in setup The directory was being overwritten when network-manager was installed later --- setup/so-functions | 2 -- setup/so-setup | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index e7ce85949..627ec934f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1849,8 +1849,6 @@ minio_generate_keys() { network_init() { disable_ipv6 set_hostname - echo "Verifying all network devices are managed by Network Manager" >> "$setup_log" 2>&1 - check_network_manager_conf if [[ "$setup_type" == 'iso' ]]; then set_management_interface fi diff --git a/setup/so-setup b/setup/so-setup index 788c48bcd..51a2e5271 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -443,6 +443,8 @@ if [[ $is_helix ]]; then fi if [[ $is_helix || $is_sensor ]]; then + echo "Verifying all network devices are managed by Network Manager that should be" >> "$setup_log" 2>&1 + check_network_manager_conf set_network_dev_status_list whiptail_sensor_nics fi