mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
resolve conflict
This commit is contained in:
@@ -1935,15 +1935,6 @@ securityonion_repo() {
|
|||||||
repo_sync_local() {
|
repo_sync_local() {
|
||||||
# Sync the repo from the the SO repo locally.
|
# Sync the repo from the the SO repo locally.
|
||||||
# Check for reposync
|
# 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 /nsm/repo
|
||||||
mkdir -p /root/reposync_cache
|
mkdir -p /root/reposync_cache
|
||||||
echo "[main]" > /root/repodownload.conf
|
echo "[main]" > /root/repodownload.conf
|
||||||
@@ -1970,7 +1961,7 @@ repo_sync_local() {
|
|||||||
if [[ ! "$REPOSYNC" -gt 0 ]]; then
|
if [[ ! "$REPOSYNC" -gt 0 ]]; then
|
||||||
# Install reposync
|
# Install reposync
|
||||||
info "Installing createrepo"
|
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
|
else
|
||||||
info "We have what we need to sync"
|
info "We have what we need to sync"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user