mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
[refactor][fix] Move nmcli status list gen to a function
nmcli is only assured to be installed after detect_os is run so move this command to a function so it can run after detect_os
This commit is contained in:
@@ -1318,6 +1318,11 @@ set_base_heapsizes() {
|
||||
ls_heapsize
|
||||
}
|
||||
|
||||
set_network_dev_status_list() {
|
||||
readarray -t nmcli_dev_status_list <<< "$(nmcli -t -f DEVICE,STATE -c no dev status)"
|
||||
export nmcli_dev_status_list
|
||||
}
|
||||
|
||||
set_main_ip() {
|
||||
MAINIP=$(ip route get 1 | awk '{print $7;exit}')
|
||||
}
|
||||
|
||||
@@ -109,6 +109,7 @@ export PATH=$PATH:../salt/common/tools/sbin
|
||||
got_root
|
||||
|
||||
detect_os && detect_ec2
|
||||
set_network_dev_status_list
|
||||
|
||||
if [ "$OS" == ubuntu ]; then
|
||||
update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
|
||||
|
||||
@@ -44,6 +44,3 @@ export local_salt_dir=/opt/so/saltstack/local
|
||||
|
||||
SCRIPTDIR=$(cd "$(dirname "$0")" && pwd)
|
||||
export SCRIPTDIR
|
||||
|
||||
readarray -t nmcli_dev_status_list <<< "$(nmcli -t -f DEVICE,STATE -c no dev status)"
|
||||
export nmcli_dev_status_list
|
||||
|
||||
Reference in New Issue
Block a user