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

[feat] Remove setup dependency on bc

Browse Source
This commit is contained in:
William Wernert
2021-03-11 15:53:04 -05:00
parent 66da3e380f
commit 5612fc10d4
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/so-functions
View File

@@ -747,10 +747,10 @@ check_requirements() {
else else
req_storage=100 req_storage=100
fi fi
if (( $(echo "$free_space_root < $req_storage" | bc -l) )); then if [[ $free_space_root -lt $req_storage ]]; then
whiptail_storage_requirements "/" "${free_space_root} GB" "${req_storage} GB" whiptail_storage_requirements "/" "${free_space_root} GB" "${req_storage} GB"
fi fi
if (( $(echo "$free_space_nsm < $req_storage" | bc -l) )); then if [[ $free_space_nsm -lt $req_storage ]]; then
whiptail_storage_requirements "/nsm" "${free_space_nsm} GB" "${req_storage} GB" whiptail_storage_requirements "/nsm" "${free_space_nsm} GB" "${req_storage} GB"
fi fi
else else
@@ -759,7 +759,7 @@ check_requirements() {
else else
req_storage=200 req_storage=200
fi fi
if (( $(echo "$free_space_root < $req_storage" | bc -l) )); then if [[ $free_space_root -lt $req_storage ]]; then
whiptail_storage_requirements "/" "${free_space_root} GB" "${req_storage} GB" whiptail_storage_requirements "/" "${free_space_root} GB" "${req_storage} GB"
fi fi
fi fi
@@ -1022,9 +1022,6 @@ installer_prereq_packages() {
systemctl start NetworkManager systemctl start NetworkManager
} >> "$setup_log" 2<&1 } >> "$setup_log" 2<&1
fi fi
if ! command -v bc > /dev/null 2>&1; then
yum -y install bc >> "$setup_log" 2>&1
fi
if ! yum versionlock > /dev/null 2>&1; then if ! yum versionlock > /dev/null 2>&1; then
yum -y install yum-plugin-versionlock >> "$setup_log" 2>&1 yum -y install yum-plugin-versionlock >> "$setup_log" 2>&1
fi fi
@@ -1043,7 +1040,7 @@ 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 bc curl" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1
fi fi
} }