Merge remote-tracking branch 'remotes/origin/dev' into pipeline

This commit is contained in:
Mike Reeves committed 2021-06-08 11:03:14 -04:00
commit 4972f69dd6
10 files changed
+161 -155

No files matched your search

+2 -1
View File
@@ -896,7 +896,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