mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
Merge pull request #15198 from Security-Onion-Solutions/jertel/wip
ensure previous setup outcomes are cleared
This commit is contained in:
@@ -1646,6 +1646,12 @@ reserve_ports() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clear_previous_setup_results() {
|
||||||
|
# Disregard previous setup outcomes.
|
||||||
|
rm -f /root/failure
|
||||||
|
rm -f /root/success
|
||||||
|
}
|
||||||
|
|
||||||
reinstall_init() {
|
reinstall_init() {
|
||||||
info "Putting system in state to run setup again"
|
info "Putting system in state to run setup again"
|
||||||
|
|
||||||
@@ -1657,10 +1663,6 @@ reinstall_init() {
|
|||||||
|
|
||||||
local service_retry_count=20
|
local service_retry_count=20
|
||||||
|
|
||||||
# Disregard previous install outcomes
|
|
||||||
rm -f /root/failure
|
|
||||||
rm -f /root/success
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# remove all of root's cronjobs
|
# remove all of root's cronjobs
|
||||||
logCmd "crontab -r -u root"
|
logCmd "crontab -r -u root"
|
||||||
|
|||||||
@@ -132,6 +132,10 @@ if [[ -f /root/accept_changes ]]; then
|
|||||||
reset_proxy
|
reset_proxy
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Previous setup attempts, even if setup doesn't actually start the installation,
|
||||||
|
# can leave behind results that may interfere with the current setup attempt.
|
||||||
|
clear_previous_setup_results
|
||||||
|
|
||||||
title "Parsing Username for Install"
|
title "Parsing Username for Install"
|
||||||
parse_install_username
|
parse_install_username
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user