CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-09 18:52:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Fix dependency install progress bar

Browse Source
This commit is contained in:
William Wernert
2021-03-11 16:34:54 -05:00
parent b35e65190e
commit b14b9e8e17
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -1007,9 +1007,6 @@ installer_progress_loop() {
} }
installer_prereq_packages() { installer_prereq_packages() {
installer_progress_loop & # Run progress bar to 100 in ~8 minutes
progress_bg_proc=$!
if [ "$OS" == centos ]; then if [ "$OS" == centos ]; then
# Print message to stdout so the user knows setup is doing something # Print message to stdout so the user knows setup is doing something
# Install bind-utils so the host command exists # Install bind-utils so the host command exists
@@ -1044,13 +1041,6 @@ installer_prereq_packages() {
fi fi
retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1
fi fi
install_success=$?
kill -9 "$progress_bg_proc" >> "$setup_log" 2>&1
if [[ $install_success -gt 0 ]]; then
echo "Could not install packages required for setup, exiting now." >> "$setup_log" 2>&1
kill -SIGUSR1 "$setup_proc" >> "$setup_log" 2>&1; exit 1
fi
} }
disable_auto_start() { disable_auto_start() {

9
setup/so-setup
View File

@@ -281,7 +281,16 @@ fi
percentage=0 percentage=0
{ {
installer_progress_loop & # Run progress bar to 100 in ~8 minutes
progress_bg_proc=$!
installer_prereq_packages installer_prereq_packages
install_success=$?
kill -9 "$progress_bg_proc"
wait "$progress_bg_proc" &> /dev/null # Kill just sends signal, redirect output of wait to catch stdout
if [[ $install_success -gt 0 ]]; then
echo "Could not install packages required for setup, exiting now." >> "$setup_log" 2>&1
kill -SIGUSR1 "$setup_proc"; exit 1
fi
set_progress_str 99 "Detecting whether setup is running in the cloud." nolog set_progress_str 99 "Detecting whether setup is running in the cloud." nolog
detect_cloud detect_cloud
} | progress '...' } | progress '...'