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 pull request #6909 from Security-Onion-Solutions/fix/preflight-curl

Browse Source 
Install curl in preflight script to avoid error on Ubuntu
This commit is contained in:
William Wernert
2022-01-18 13:39:44 -05:00
committed by GitHub
parent 19ccd5f8e9 c0c42c3574
commit a3925d231c
2 changed files with 12 additions and 1 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 systemctl start NetworkManager
} >> "$setup_log" 2<&1 } >> "$setup_log" 2<&1
fi 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 fi
} }

9
setup/so-preflight
View File

@@ -168,6 +168,14 @@ __check_url_arr() {
return $ret_code 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() { main() {
local intro_str="Beginning pre-flight checks." local intro_str="Beginning pre-flight checks."
local success_str="Pre-flight checks completed successfully!" local success_str="Pre-flight checks completed successfully!"
@@ -183,6 +191,7 @@ main() {
echo "$intro_str" | tee "$preflight_log" echo "$intro_str" | tee "$preflight_log"
fi fi
check_default_repos &&\ check_default_repos &&\
preflight_prereqs &&\
check_new_repos &&\ check_new_repos &&\
check_misc_urls check_misc_urls