From 362bf555260b4141bb6dd796da6fdf10d12df582 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Sun, 28 Mar 2021 22:01:58 -0400
Subject: [PATCH] fixpath for GPG keys

---
 setup/so-functions | 1 +
 setup/so-setup     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index d98a833da..99819e9a9 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2226,6 +2226,7 @@ securityonion_repo() {
 	if [[ "$OS" == "centos" ]]; then
 	    mkdir -p /root/oldrepos
 	    mv /etc/yum.repos.d/* /root/oldrepos/
+		rm -f /etc/yum.repos.d/*
 		if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then
 		    cp -f ./yum_repos/securityonioncache.repo /etc/yum.repos.d/
 		else
diff --git a/setup/so-setup b/setup/so-setup
index 7d42f94bc..9beb11cec 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -632,8 +632,8 @@ set_redirect >> $setup_log 2>&1
 
 	set_progress_str 2 'Updating packages'
 	# Import the gpg keys
-	gpg_rpm_import
-	if [[ ! $is_airgap ]]
+	gpg_rpm_import >> $setup_log 2>&1
+	if [[ ! $is_airgap ]]; then
 	    securityonion_repo >> $setup_log 2>&1
 	    update_packages >> $setup_log 2>&1
 	fi