From f0ff0d51f7858a3270797575e47de5d07119c2e1 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 30 Jun 2022 16:59:54 -0400
Subject: [PATCH] allow bootstrap-salt to install specific verion even if -r is
 used

---
 salt/salt/scripts/bootstrap-salt.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/salt/salt/scripts/bootstrap-salt.sh b/salt/salt/scripts/bootstrap-salt.sh
index 90070042f..be5477ca4 100644
--- a/salt/salt/scripts/bootstrap-salt.sh
+++ b/salt/salt/scripts/bootstrap-salt.sh
@@ -4221,8 +4221,13 @@ install_centos_stable() {
     local minion='salt-minion'
     local syndic='salt-syndic'
 
-    if echo "$STABLE_REV" | grep -q "archive";then
-        local ver=$(echo "$STABLE_REV"|awk -F/ '{print $2}')
+    if echo "$STABLE_REV" | grep -q "archive";then # point release being applied
+        local ver=$(echo "$STABLE_REV"|awk -F/ '{print $2}') # strip archive/
+    elif echo "$STABLE_REV" | grep -vq "archive|latest";then # latest or major version(3003, 3004, etc) being applie
+        local ver=$STABLE_REV
+    fi
+
+    if [ ! -z $ver ]; then
         cloud+="-$ver"
         master+="-$ver"
         minion+="-$ver"