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

[fix] Actually call nic comparison function, redirect tarball gen to setup_log

Browse Source
This commit is contained in:
William Wernert
2020-12-09 11:51:07 -05:00
parent 223856c0b9
commit 282b4090ce
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/so-setup
View File

@@ -480,10 +480,9 @@ if [[ $is_minion ]]; then
fi fi
# This block sets REDIRECTIT which is used by a function outside the below subshell # This block sets REDIRECTIT which is used by a function outside the below subshell
{ set_main_ip >> $setup_log 2>&1
set_main_ip; compare_main_nic_ip
set_redirect; set_redirect >> $setup_log 2>&1
} >> $setup_log 2>&1
# Begin install # Begin install
{ {
@@ -824,7 +823,7 @@ else
if [[ $is_manager ]]; then if [[ $is_manager ]]; then
set_progress_str 98 "Generating archive for setup directory" set_progress_str 98 "Generating archive for setup directory"
generate_repo_tarball generate_repo_tarball >> "$setup_log" 2>&1
fi fi
if [[ $THEHIVE == 1 ]]; then if [[ $THEHIVE == 1 ]]; then
@@ -837,6 +836,6 @@ else
echo "Post-installation steps have completed." >> $setup_log 2>&1 echo "Post-installation steps have completed." >> $setup_log 2>&1
fi fi
install_cleanup >> $setup_log 2>&1 install_cleanup >> "$setup_log" 2>&1
if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi