resolve conflict

This commit is contained in:
m0duspwnens
2023-01-10 11:50:58 -05:00
parent ab8f41ecb5
commit 39d808cb8f

View File

@@ -1935,15 +1935,6 @@ securityonion_repo() {
repo_sync_local() {
# Sync the repo from the the SO repo locally.
# Check for reposync
REPOSYNC=$(rpm -qa | grep createrepo | wc -l)
if [[ ! "$REPOSYNC" -gt 0 ]]; then
# Install reposync
info "Installing createrepo"
logCmd "yum install -y -c /root/repodownload.conf --disablerepo='*' --enablerepo='securityonionsync' yum-utils createrepo"
else
info "We have what we need to sync"
fi
info "Backing up old repos"
mkdir -p /nsm/repo
mkdir -p /root/reposync_cache
echo "[main]" > /root/repodownload.conf
@@ -1970,7 +1961,7 @@ repo_sync_local() {
if [[ ! "$REPOSYNC" -gt 0 ]]; then
# Install reposync
info "Installing createrepo"
logCmd "yum -y install -c /root/repodownload.conf yum-utils createrepo"
logCmd "yum install -y -c /root/repodownload.conf --disablerepo='*' --enablerepo='securityonionsync' yum-utils createrepo"
else
info "We have what we need to sync"
fi