Merge branch 'dev' into kilo

This commit is contained in:
Jason Ertel
2021-06-08 11:04:09 -04:00
13 changed files with 171 additions and 165 deletions

View File

@@ -898,7 +898,8 @@ compare_main_nic_ip() {
This is not a supported configuration, please remediate and rerun setup.
EOM
[[ -n $TESTING ]] || whiptail --title "Security Onion Setup" --msgbox "$message" 10 75
[[ -n $TESTING ]] || whiptail --title "$whiptail_title" --msgbox "$message" 10 75
kill -SIGINT "$(ps --pid $$ -oppid=)"; exit 1
fi
else
@@ -1428,7 +1429,7 @@ generate_passwords(){
generate_repo_tarball() {
mkdir /opt/so/repo
tar -czf /opt/so/repo/"$SOVERSION".tar.gz ../.
tar -czf /opt/so/repo/"$SOVERSION".tar.gz -C "$(pwd)/.." .
}
generate_sensor_vars() {