From 8d6c2600c97e66f20cdb42d1da40929875d3daca Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 17 Jul 2023 13:49:08 -0400 Subject: [PATCH 1/2] fix other OS installs --- setup/so-functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index c62322cc1..d8c86eda5 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1948,7 +1948,7 @@ securityonion_repo() { echo "gpgcheck=1" >> /etc/yum.repos.d/securityonion.repo fi fi - logCmd "dnf repolist all" + if [[ $is_rpm ]]; then logCmd "dnf repolist all"; fi if [[ $waitforstate ]]; then if [[ ! $is_airgap ]]; then if [[ $is_rpm ]]; then @@ -2019,6 +2019,7 @@ repo_sync_local() { } saltify() { + info "Installing Salt" SALTVERSION=$(egrep 'version: [0-9]{4}' ../salt/salt/master.defaults.yaml | sed 's/^.*version: //') if [[ $is_deb ]]; then From 7fad710ca1d377d0f3ccbae0d016b8901d0151ea Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 17 Jul 2023 13:51:01 -0400 Subject: [PATCH 2/2] fix other OS installs --- setup/so-functions | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/so-functions b/setup/so-functions index d8c86eda5..c80df2347 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -981,6 +981,7 @@ detect_os() { UBVER=20.04 OS=ubuntu is_ubuntu=true + is_deb=true not_supported=true unset is_supported elif grep -q "UBUNTU_CODENAME=jammy" /etc/os-release; then