Merge pull request #10371 from Security-Onion-Solutions/salt3006.1

Salt3006.1
This commit is contained in:
Josh Patterson
2023-05-16 16:59:31 -04:00
committed by GitHub

View File

@@ -2000,7 +2000,7 @@ repo_sync_local() {
}
saltify() {
SALTVERSION=$(egrep 'version: [0-9]{4}' /opt/so/saltstack/default/salt/salt/master.defaults.yaml | sed 's/^.*version: //')
SALTVERSION=$(egrep 'version: [0-9]{4}' ../salt/salt/master.defaults.yaml | sed 's/^.*version: //')
if [[ $is_ubuntu ]]; then
DEBIAN_FRONTEND=noninteractive retry 150 20 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1