mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-12 20:22:59 +01:00
merge with 2.4dev and fix conflict
This commit is contained in:
@@ -585,7 +585,7 @@ if ! [[ -f $install_opt_file ]]; then
|
||||
fi
|
||||
checkin_at_boot
|
||||
set_initial_firewall_access
|
||||
whiptail_setup_complete
|
||||
verify_setup
|
||||
else
|
||||
touch /root/accept_changes
|
||||
mkdir -p /opt/so
|
||||
@@ -610,9 +610,8 @@ if ! [[ -f $install_opt_file ]]; then
|
||||
checkin_at_boot
|
||||
logCmd "salt-call state.apply setup.highstate_cron --local --file-root=../salt/"
|
||||
whiptail_setup_complete
|
||||
verify_setup
|
||||
fi
|
||||
|
||||
# Need to make sure the latest install is located on the web server of the manager to check the versions and donwload the code if required
|
||||
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user