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

Merge remote-tracking branch 'remotes/origin/dev' into issue/6810

Browse Source
This commit is contained in:
m0duspwnens
2022-01-19 11:57:37 -05:00
parent 4d078046d6 13dbd0034f
commit f8ac37c101
6 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -1156,7 +1156,9 @@ installer_prereq_packages() {
systemctl start NetworkManager
} >> "$setup_log" 2<&1
fi
retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1
if ! command -v curl > /dev/null 2>&1; then
retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1
fi
fi
}

9
setup/so-preflight
View File

@@ -168,6 +168,14 @@ __check_url_arr() {
return $ret_code
}
preflight_prereqs() {
if [[ $OS == 'centos' ]]; then
: # no-op to match structure of other checks for $OS var
else
retry 50 10 "apt-get -y install curl" >> "$preflight_log" 2>&1 || exit 1
fi
}
main() {
local intro_str="Beginning pre-flight checks."
local success_str="Pre-flight checks completed successfully!"
@@ -183,6 +191,7 @@ main() {
echo "$intro_str" | tee "$preflight_log"
fi
check_default_repos &&\
preflight_prereqs &&\
check_new_repos &&\
check_misc_urls

2
setup/so-whiptail
View File

@@ -798,7 +798,7 @@ whiptail_install_type_dist_existing() {
Note: Heavy nodes (HEAVYNODE) are NOT recommended for most users.
EOM
install_type=$(whiptail --title "$whiptail_title" --radiolist "$node_msg" 18 58 5 \
install_type=$(whiptail --title "$whiptail_title" --radiolist "$node_msg" 19 58 5 \
"SENSOR" "Create a forward only sensor " ON \
"SEARCHNODE" "Add a search node with parsing " OFF \
"FLEET" "Dedicated Fleet Osquery Node " OFF \