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

[refactor] Only notify user of error found during setup

Browse Source
This commit is contained in:
William Wernert
2020-07-07 13:01:29 -04:00
parent 62cc02301e
commit 0b995533ea
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup/so-setup
View File

@@ -51,21 +51,22 @@ echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1
automated=no automated=no
function progress() { function progress() {
local title='Security Onion Install'
if grep -q "ERROR" $setup_log || [[ -s /var/spool/mail/root ]]; then if grep -q "ERROR" $setup_log || [[ -s /var/spool/mail/root ]]; then
if [[ -s /var/spool/mail/root ]]; then if [[ -s /var/spool/mail/root ]]; then
echo '[ ERROR ] /var/spool/mail/root grew unexpectedly' >> $setup_log 2>&1 echo '[ ERROR ] /var/spool/mail/root grew unexpectedly' >> $setup_log 2>&1
fi fi
if [[ $automated == no ]]; then whiptail_setup_failed; else exit 1; fi export SO_ERROR=1
export SKIP_REBOOT=1
if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit 1; fi title="Error found, please check $setup_log"
else
if [ $automated == no ]; then
whiptail --title "Security Onion Install" --gauge 'Please wait while installing' 6 60 0
else
cat >> $setup_log 2>&1
fi
fi fi
if [ $automated == no ]; then
whiptail --title "$title" --gauge 'Please wait while installing...' 6 60 0 # append to text
else
cat >> $setup_log 2>&1
fi
} }
if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then