From e536ffa36387c63a97e820cf3606e44ae94da228 Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Tue, 9 Jun 2026 09:35:24 -0400
Subject: [PATCH] so-boot-mine-update: render node_data after mine.update
 before highstate

After the boot-time mine.update, have the manager actually render the
node_data pillar and log whether it came back populated. node_data: False
makes salt/top.sls apply the bootstrap recovery branch instead of the
manager's real config, so surfacing this in the journal makes the
condition visible before so-boot-highstate runs. Best-effort and
non-blocking: always exits 0 so highstate proceeds regardless.
---
 salt/manager/tools/sbin/so-boot-mine-update | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/salt/manager/tools/sbin/so-boot-mine-update b/salt/manager/tools/sbin/so-boot-mine-update
index f497d891f..292b24ecc 100755
--- a/salt/manager/tools/sbin/so-boot-mine-update
+++ b/salt/manager/tools/sbin/so-boot-mine-update
@@ -40,3 +40,20 @@ done
 
 echo "so-boot-mine-update: ${up} minions up (settled after ${elapsed}s); running mine.update"
 /usr/bin/salt '*' mine.update --out=txt
+
+# Best-effort: confirm the manager can render node_data (non-False) now that the
+# mine is updated. node_data: False makes salt/top.sls fall back to the bootstrap
+# recovery branch instead of the manager's real config, so we surface that in the
+# journal here. We never block highstate -- if still empty, the recovery branch
+# and later highstates self-heal.
+/usr/bin/salt-call saltutil.refresh_pillar >/dev/null 2>&1
+sleep 2
+status=$(/usr/bin/salt-call --out=json pillar.get node_data 2>/dev/null \
+  | python3 -c 'import sys,json; d=json.load(sys.stdin).get("local"); print("rendered" if d else "empty")' 2>/dev/null)
+status=${status:-empty}
+if [ "$status" = "rendered" ]; then
+  echo "so-boot-mine-update: node_data renders; highstate will apply manager config"
+else
+  echo "so-boot-mine-update: WARNING node_data still empty after mine.update; highstate may hit the bootstrap recovery branch"
+fi
+exit 0