merge with 2.4dev and fix conflict

This commit is contained in:
m0duspwnens
2023-01-23 14:49:32 -05:00
15 changed files with 162 additions and 32 deletions

View File

@@ -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