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

bootstrap.sh, dont start salt services after salt upgrade, allow soup to do it

Browse Source
This commit is contained in:
m0duspwnens
2022-01-11 13:11:25 -05:00
parent 9d19cba600
commit e33a9eb45c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,7 +788,7 @@ upgrade_salt() {
echo "" echo ""
set +e set +e
run_check_net_err \ run_check_net_err \
"sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -r -F -M -x python3 stable \"$NEWSALTVERSION\"" \ "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -F -M -x python3 stable \"$NEWSALTVERSION\"" \
"Could not update salt, please check $SOUP_LOG for details." "Could not update salt, please check $SOUP_LOG for details."
set -e set -e
echo "Applying yum versionlock for Salt." echo "Applying yum versionlock for Salt."
@@ -805,7 +805,7 @@ upgrade_salt() {
echo "" echo ""
set +e set +e
run_check_net_err \ run_check_net_err \
"sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -F -M -x python3 stable \"$NEWSALTVERSION\"" \ "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -F -M -x python3 stable \"$NEWSALTVERSION\"" \
"Could not update salt, please check $SOUP_LOG for details." "Could not update salt, please check $SOUP_LOG for details."
set -e set -e
echo "Applying apt hold for Salt." echo "Applying apt hold for Salt."