Merge pull request #6258 from Security-Onion-Solutions/fix/nm-conf

Run `check_network_manager_conf()` later in setup
This commit is contained in:
William Wernert
2021-11-17 08:44:25 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -1849,8 +1849,6 @@ minio_generate_keys() {
network_init() { network_init() {
disable_ipv6 disable_ipv6
set_hostname 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 if [[ "$setup_type" == 'iso' ]]; then
set_management_interface set_management_interface
fi fi

View File

@@ -443,6 +443,8 @@ if [[ $is_helix ]]; then
fi fi
if [[ $is_helix || $is_sensor ]]; then 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 set_network_dev_status_list
whiptail_sensor_nics whiptail_sensor_nics
fi fi