diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 1695ac0c2..86d48e2d1 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -16,6 +16,7 @@ # along with this program. If not, see . . /usr/sbin/so-common +export LC_CTYPE="en_US.UTF-8" UPDATE_DIR=/tmp/sogh/securityonion DEFAULT_SALT_DIR=/opt/so/saltstack/default @@ -872,6 +873,7 @@ apply_hotfix() { main() { trap 'check_err $?' EXIT + echo "### Preparing soup at $(date) ###" check_pillar_items echo "Checking to see if this is an airgap install." @@ -1183,5 +1185,4 @@ EOF read -r input fi -echo "### Preparing soup at $(date) ###" main "$@" | tee -a $SOUP_LOG diff --git a/setup/so-functions b/setup/so-functions index daf609f67..3d88a7fdb 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2016,10 +2016,10 @@ reinstall_init() { { if command -v salt-call &> /dev/null && grep -q "master:" /etc/salt/minion 2> /dev/null; then # Disable schedule so highstate doesn't start running during the install - salt-call -l info schedule.disable + salt-call -l info schedule.disable --local # Kill any currently running salt jobs, also to prevent issues with highstate. - salt-call -l info saltutil.kill_all_jobs + salt-call -l info saltutil.kill_all_jobs --local fi # Kill any salt processes (safely)