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

change when we detect os and wait_for_apt when installing sshpass

Browse Source
This commit is contained in:
m0duspwnens
2021-01-25 13:47:51 -05:00
parent e1f7c090f3
commit 7dcca6f364
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/so-setup
View File

@@ -104,7 +104,7 @@ function progress() {
fi
}
detect_os && detect_cloud
detect_os
if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then
echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1
@@ -130,7 +130,7 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
if [[ ! $is_iso ]]; then
echo "Installing sshpass for automated testing." >> $setup_log 2>&1
if [ "$OS" == ubuntu ]; then
apt-get -y install sshpass >> $setup_log 2>&1
if wait_for_apt; then apt-get -y install sshpass >> $setup_log 2>&1
else
yum -y install sshpass >> $setup_log 2>&1
fi
@@ -154,6 +154,7 @@ set_ssh_cmds $automated
local_sbin="$(pwd)/../salt/common/tools/sbin"
export PATH=$PATH:$local_sbin
installer_prereq_packages && detect_cloud
set_network_dev_status_list
if [ "$OS" == ubuntu ]; then