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

[refactor] Move install_cleanup outside of whiptail functions

Browse Source
This commit is contained in:
William Wernert
2020-07-07 13:02:58 -04:00
parent 0b995533ea
commit 1d47cec928
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/so-setup
View File

@@ -633,3 +633,6 @@ fi
if [[ -z $SKIP_REBOOT ]]; then if [[ -z $SKIP_REBOOT ]]; then
shutdown -r now shutdown -r now
fi fi
install_cleanup >> $setup_log 2>&1

6
setup/so-whiptail
View File

@@ -1036,17 +1036,13 @@ whiptail_setup_complete() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
whiptail --title "Security Onion Setup" --msgbox "Finished $install_type install. Press Ok to reboot." 8 75 whiptail --title "Security Onion Setup" --msgbox "Finished $install_type install. Press Ok to reboot." 8 75
install_cleanup >> $setup_log 2>&1
} }
whiptail_setup_failed() { whiptail_setup_failed() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
whiptail --title "Security Onion Setup" --msgbox "Install had a problem. Please see $setup_log for details. Press Ok to reboot." 8 75 whiptail --title "Security Onion Setup" --msgbox "Install had a problem. Please see $setup_log for details. Press Ok to exit." 8 75
install_cleanup >> $setup_log 2>&1
} }
whiptail_shard_count() { whiptail_shard_count() {