CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-19 15:33:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue in soup

Browse Source
This commit is contained in:
William Wernert
2021-06-16 14:28:20 -04:00
parent edac99e5a9
commit 703988b376
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
salt/common/tools/sbin/soup
View File

@@ -779,12 +779,6 @@ main() {
verify_latest_update_script verify_latest_update_script
echo "" echo ""
echo "Stopping Salt Master service."
systemctl stop salt-master
echo ""
upgrade_to_2.3.50_repo
echo "Generating new repo archive" echo "Generating new repo archive"
generate_and_clean_tarballs generate_and_clean_tarballs
if [ -f /usr/sbin/so-image-common ]; then if [ -f /usr/sbin/so-image-common ]; then
@@ -837,7 +831,7 @@ main() {
systemctl stop salt-master systemctl stop salt-master
echo "" echo ""
preupgrade_changes_2.3.50_repo upgrade_to_2.3.50_repo
# Does salt need upgraded. If so update it. # Does salt need upgraded. If so update it.
if [[ $UPGRADESALT -eq 1 ]]; then if [[ $UPGRADESALT -eq 1 ]]; then