From ff2d2c7c0450f58d16eda87249e0c041d3972bd8 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 2 Dec 2021 16:39:32 -0500 Subject: [PATCH 1/3] export LC_CTYPE="en_US.UTF-8" - https://github.com/Security-Onion-Solutions/securityonion/discussions/6431 --- salt/common/tools/sbin/soup | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 1695ac0c2..e5563cddb 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 From c6773a0bbcf679becb87def2bc2916bdc819c6ad Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 3 Dec 2021 10:26:22 -0500 Subject: [PATCH 2/3] move "Preparing soup" to main so shows in soup.log --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index e5563cddb..86d48e2d1 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -873,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." @@ -1184,5 +1185,4 @@ EOF read -r input fi -echo "### Preparing soup at $(date) ###" main "$@" | tee -a $SOUP_LOG From 65b1ab833ddb8b3e1ab8ee75552d2ba362af956e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 3 Dec 2021 12:00:29 -0500 Subject: [PATCH 3/3] run salt-call locally as if no Salt master were present during reinstall - https://github.com/Security-Onion-Solutions/securityonion/discussions/6435 --- setup/so-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)