Merge develop into stable for v2024.12.09 release

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/workflows/ci.yml

@@ -114,6 +114,22 @@ jobs:
 
 
 
+  macos-12:
+    name: macOS 12
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-macos.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: macos-12
+      display-name: macOS 12
+      container-slug: macos-12
+      timeout: 20
+      runs-on: macos-12
+      instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
+
+
   macos-13:
     name: macOS 13
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -164,36 +180,6 @@ jobs:
 
 
 
-  amazonlinux-2023:
-    name: Amazon 2023
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: amazonlinux-2023
-      display-name: Amazon 2023
-      container-slug: amazonlinux-2023
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
-
-
-  debian-11:
-    name: Debian 11
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: debian-11
-      display-name: Debian 11
-      container-slug: debian-11
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
-
-
   debian-12:
     name: Debian 12
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -204,7 +190,7 @@ jobs:
     with:
       distro-slug: debian-12
       display-name: Debian 12
-      container-slug: debian-12
+      container-slug: systemd-debian-12
       timeout: 20
       instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
@@ -219,7 +205,7 @@ jobs:
     with:
       distro-slug: photon-5
       display-name: Photon OS 5
-      container-slug: photon-5
+      container-slug: systemd-photon-5
       timeout: 20
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
@@ -234,7 +220,7 @@ jobs:
     with:
       distro-slug: rockylinux-8
       display-name: Rocky Linux 8
-      container-slug: rockylinux-8
+      container-slug: systemd-rockylinux-8
       timeout: 20
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
@@ -249,7 +235,7 @@ jobs:
     with:
       distro-slug: rockylinux-9
       display-name: Rocky Linux 9
-      container-slug: rockylinux-9
+      container-slug: systemd-rockylinux-9
       timeout: 20
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
@@ -264,7 +250,7 @@ jobs:
     with:
       distro-slug: ubuntu-2204
       display-name: Ubuntu 22.04
-      container-slug: ubuntu-22.04
+      container-slug: systemd-ubuntu-22.04
       timeout: 20
       instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
@@ -277,11 +263,10 @@ jobs:
     needs:
       - lint
       - generate-actions-workflow
+      - macos-12
       - macos-13
       - macos-14
       - windows-2022
-      - amazonlinux-2023
-      - debian-11
       - debian-12
       - photon-5
       - rockylinux-8

.github/workflows/templates/generate.py

@@ -6,15 +6,17 @@ import pathlib
 
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
+# only test against current containers with systemd
+# will add these when they become available with systemd
 #    "amazonlinux-2",
+#    "amazonlinux-2023",
+#    "debian-11",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 LINUX_DISTROS = [
-    "amazonlinux-2023",
-    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -27,19 +29,22 @@ WINDOWS = [
 ]
 
 OSX = [
+    "macos-12",
     "macos-13",
     "macos-14",
 ]
 
+# only test against current containers with systemd
+# will add these when they become available with systemd
 #    "amazonlinux-2",
+#    "amazonlinux-2023",
+#    "debian-11",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 STABLE_DISTROS = [
-    "amazonlinux-2023",
-    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -47,15 +52,17 @@ STABLE_DISTROS = [
     "ubuntu-2204",
 ]
 
+# only test against current containers with systemd
+# will add these when they become available with systemd
 #    "amazonlinux-2",
+#    "amazonlinux-2023",
+#    "debian-11",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 ONEDIR_DISTROS = [
-    "amazonlinux-2023",
-    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -63,6 +70,8 @@ ONEDIR_DISTROS = [
     "ubuntu-2204",
 ]
 
+# only test against current containers with systemd
+# will add these when they become available with systemd
 #    "amazonlinux-2",
 #    "amazonlinux-2023",
 #    "photon-4",
@@ -93,7 +102,6 @@ BLACKLIST_GIT_3006 = [
     "amazonlinux-2023",
     "debian-11",
     "debian-12",
-    "debian-13",
     "fedora-40",
     "photon-4",
     "photon-5",
@@ -202,25 +210,27 @@ DISTRO_DISPLAY_NAMES = {
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2204": "Ubuntu 22.04",
     "ubuntu-2404": "Ubuntu 24.04",
+    "macos-12": "macOS 12",
     "macos-13": "macOS 13",
     "macos-14": "macOS 14",
     "windows-2022": "Windows 2022",
 }
 
 CONTAINER_SLUG_NAMES = {
-    "amazonlinux-2": "amazonlinux-2",
+    "amazonlinux-2": "systemd-amazonlinux-2",
-    "amazonlinux-2023": "amazonlinux-2023",
+    "amazonlinux-2023": "systemd-amazonlinux-2023",
-    "debian-11": "debian-11",
+    "debian-11": "systemd-debian-11",
-    "debian-12": "debian-12",
+    "debian-12": "systemd-debian-12",
-    "debian-13": "debian-13",
+    "debian-13": "systemd-debian-13",
-    "fedora-40": "fedora-40",
+    "fedora-40": "systemd-fedora-40",
-    "photon-4": "photon-4",
+    "photon-4": "systemd-photon-4",
-    "photon-5": "photon-5",
+    "photon-5": "systemd-photon-5",
-    "rockylinux-8": "rockylinux-8",
+    "rockylinux-8": "systemd-rockylinux-8",
-    "rockylinux-9": "rockylinux-9",
+    "rockylinux-9": "systemd-rockylinux-9",
-    "ubuntu-2004": "ubuntu-20.04",
+    "ubuntu-2004": "systemd-ubuntu-20.04",
-    "ubuntu-2204": "ubuntu-22.04",
+    "ubuntu-2204": "systemd-ubuntu-22.04",
-    "ubuntu-2404": "ubuntu-24.04",
+    "ubuntu-2404": "systemd-ubuntu-24.04",
+    "macos-12": "macos-12",
     "macos-13": "macos-13",
     "macos-14": "macOS 14",
     "windows-2022": "windows-2022",

.github/workflows/templates/main.yml

@@ -0,0 +1,13 @@
+# DO NOT EDIT THIS FILE DIRECTLY!
+#
+# This file was generated by .github/workflows/templates/generate.py
+#
+# yamllint disable rule:line-length rule:empty-lines
+---
+
+name: {name}
+
+'on': [{on}]
+
+jobs:
+{jobs}

.github/workflows/test-linux.yml

@@ -32,6 +32,10 @@ jobs:
   Test:
     name: ${{ matrix.instance }}
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }}
+      options: --privileged
+
     timeout-minutes: ${{ inputs.timeout }}
     strategy:
       max-parallel: 2
@@ -42,6 +46,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Python Dependencies with pip breakage
+        if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
+        run: |
+          python3 -m pip install --break-system-packages -r tests/requirements.txt
+
+      - name: Install Python Dependencies without pip breakage
+        if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
+        run: |
+          python3 -m pip install -r tests/requirements.txt
+
       - name: Get Version
         run: |
           # We need to get the version here and make it an environment variable
@@ -51,39 +65,17 @@ jobs:
           vt_parm_ver=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
           echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
 
-      - name: "Pull container ${{ inputs.container-slug }}"
-        run: |
-          docker pull ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }}
-
-      - name: "Create container ${{ inputs.container-slug }}"
-        run: |
-          /usr/bin/docker create --name ${{ github.run_id }}_salt-test --workdir /_w/ --privileged -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -e $GITHUB_ENV -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" -v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" -v "/home/runner/work/_temp/_github_home":"/github/home" -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" -v "/home/runner/work/salt-bootstrap/salt-bootstrap":"/_w/btstrap"  --entrypoint "/usr/lib/systemd/systemd" ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }} --systemd --unit rescue.target
-
-      - name: "Start container ${{ inputs.container-slug }}"
-        run: |
-          /usr/bin/docker start ${{ github.run_id }}_salt-test
-
-      - name: "Install Python Dependencies with pip breakage in container ${{ inputs.container-slug }}"
-        if: ${{ ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
-        run: |
-          docker exec ${{ github.run_id}}_salt-test python3 -m pip install --break-system-packages -r /_w/btstrap/tests/requirements.txt
-
-      - name: "Install Python Dependencies without pip breakage in container ${{ inputs.container-slug }}"
-        if: ${{ ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
-        run: |
-          docker exec ${{ github.run_id}}_salt-test python3 -m pip install -r /_w/btstrap/tests/requirements.txt
-
       - name: Bootstrap Salt
         run: |
           # sed 1st - becomes space, 2nd - becomes dot
           bt_arg1=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $1}')
           bt_arg2=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
           echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
-          docker exec ${{ github.run_id}}_salt-test sh -x /_w/btstrap/bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
+          sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
         run: |
-          docker exec ${{ github.run_id}}_salt-test pytest --cache-clear -v -s -ra --log-cli-level=debug /_w/btstrap/tests/integration/
+          pytest --cache-clear -v -s -ra --log-cli-level=debug tests/integration/
 
       - name: Set Exit Status
         if: always()

.github/workflows/test-macos.yml

@@ -48,12 +48,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Python Dependencies with pip breakage
-        if: ${{ inputs.distro-slug != 'macos-13' }}
+        if: ${{ ( inputs.distro-slug != 'macos-12' ) && ( inputs.distro-slug != 'macos-13' ) }}
         run: |
           python3 -m pip install --break-system-packages -r tests/requirements.txt
 
       - name: Install Python Dependencies without pip breakage
-        if: ${{ inputs.distro-slug == 'macos-13' }}
+        if: ${{ ( inputs.distro-slug == 'macos-12' ) || ( inputs.distro-slug == 'macos-13' ) }}
         run: |
           python3 -m pip install -r tests/requirements.txt
 

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
           - actionlint
 
   - repo: https://github.com/jazzband/pip-tools
-    rev: 7.4.1
+    rev: 7.3.0
     hooks:
       - id: pip-compile
         files: ^requirements/release\.(in|txt)$
@@ -41,10 +41,8 @@ repos:
     rev: v3.15.0
     hooks:
       - id: pyupgrade
-        name: Rewrite Code to be Py3.6+
+        name: Rewrite Code to be Py3.9+
-        args: [--py36-plus]
+        args: [--py39-plus]
-        ## DGM name: Rewrite Code to be Py3.9+
-        ## DGM args: [--py39-plus]
 
   - repo: https://github.com/asottile/reorder_python_imports
     rev: v3.12.0

CHANGELOG.md

@@ -1,23 +1,3 @@
-# v2025.02.24
-
-## What's Changed
-
-- Update requirements to address security issues by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2073
-- Use treeless clone to 'shallow' clone again. by @mrichar1 in https://github.com/saltstack/salt-bootstrap/pull/2022
-- Fix powershell instructions by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2074
-- Remove support for macos-12, as deprecated by github by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2076
-
-**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.12.12...v2025.02.24
-
-# v2024.12.12
-
-## What's Changed
-
-- Restrict use of dnf to Fedora only, otherwise use yum when dealing with RedHat family by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2070
-- Updating container usage to that used in new Salt pipelines for CI/CD, fix Amazon Linux by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2071
-
-**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.12.09...v2024.12.12
-
 # v2024.12.09
 
 ## What's Changed

ChangeLog~HEAD

@@ -0,0 +1,873 @@
+Version TBD (In Progress on the Develop Branch):
+
+Version 2022.03.15:
+	* Add detection and functions for AlmaLinux and Rocky Linux (myii) #1803
+	* Copy configs to correct config dirs (v3004+) (dafyddj) #1798
+	* Support Non-LTS Ubuntu 21.04 & 21.10 (blindpirate) #1793
+	* Use native repositories for Debian 11 (jpacura) #1615
+	* Keep all command-line parameters when UAC is enabled (Simon-TheUser) #1613
+	* Add support for Raspbian (Jille) #1612
+	* Add openrc to alpine:latest dependencies (krionbsd) #1609
+	* Add CentOS 7 base key (bryceml) #1608
+	* Fix git master install on alpine 3.12+ (Nascire) #1604
+	* Sort help alphabetically (krionbsd) #1601
+
+Version 2021.09.17:
+	* Re-add Ubuntu-16 support as it's still supported with 3001 and 3002 (krionbsd) #1594
+	* Add oncoming 3004 release (krionbsd) #1593
+
+Version 2021.09.14:
+	* Update latest Salt version in README (krionbsd) #1588
+	* Make Python 3 the default (bryceml) #1577
+	* Don't output info if using the default -x value (bryceml) #1587
+
+Version 2021.08.19:
+    * Update README with instructions to use salt-bootstrap custom version (ari) #1580
+    * Remove unsupported versions (bryceml) #1578
+    * Update FreeBSD default Python version to 3.8 (myii) #1574
+
+Version 2021.06.23:
+	* Use salt.list instead of saltstack.list (bryceml) #1563
+	* Use fetch_url function for curl (xeacott) #1562
+	* Add Ubuntu 21.04 support (krionbsd) #1559
+	* Remove python2-futures package for ArchLinux (myii) #1546
+
+Version 2020.03.02:
+	* Debian 11 (bullseye/testing) support using Debian 10 packages (jpacura, bryceml) #1514
+	* Fix bootstrap on Gentoo (ijansky) #1516 #1518
+	* Fix project URLs (bryceml) #1526
+	* FreeBSD also needs the _PKI_DIR reset (krionbsd) #1523
+	* Fix openSUSE Tumbleweed support. (myii) #1525
+	* Fix Debian and Ubuntu version support. (jpacura) #1529
+	* Powershell: Implement configure only option (for Vagrant). (dafyddj) #1530
+	* Powershell: Handle Vagrant's `grains_config` option. (dafyddj) #1520
+	* apt-key is deprecated on Debian 10+ and Ubuntu 20+ (bryceml) #1533
+	* Fix python Tornado on FreeBSD. (krionbsd) #1522
+
+Version 2020.10.20:
+	* Add support to allow bootstrapping Salt 3002 (s0undt3ch) #1506
+
+Version 2020.10.19:
+	* Fix v3000+ with git install on FreeBSD (krionbsd) #1487
+	* Update README giving ONE example of WINDOWS bootstrapping. Default to python3 instead of
+	python2. (noelmcloughlin) #1496
+	* Support git and stable salt-bootstrap on Gentoo. (ijansky) #1500
+	* Add support for Linux Mint 20. (taigrr) #1502
+	* Adding missing functions for Red Hat 8. (mbochenk) #1489
+	* Allow pinning minor 3xxx versions. (max-arnold) #1491
+
+Version 2020.06.23:
+	* Fix for Cumulus Linux 4.1 (darylturner) #1474
+	* Fix file download exit code, improve error message on failed download (bryceml) #1478
+	* Add support for Ubuntu 20.04 (bryceml) #1479
+	* Default Ubuntu 20.04 to Py3 since there isn't a Py2 release for it (bryceml) #1480
+	* Warn instead of exit when using -R and -x python3 on centos to allow installing python3
+	versions of salt on centos from other repos.  Old unsupported releases probably need to
+	manually install epel-release before running the bootstrap script for versions before 2018.3.5
+	and before 2019.2.1 (bryceml) #1482
+	* Start maintaining .sha256 files for the bootstrap script
+
+Version 2020.05.28:
+	* Fix Opensuse Tumbleweed (noelmcloughlin) #1441
+	* Remove Debian 8 from Python 3 supported list (jay1648) #1448
+	* Fixed deps parsing for FreeBSD git installs (cedwards) #1462
+	* Added support for the upcoming Sodium release (s0undt3ch) #1466
+	* Fixed KDE Neon detection (ender8282) #1466
+	* Updated README python 2 and 3 installations (gdebunne) #1466
+	* Updated README and CONTRIBUTING to prefer Salt's master branch (DmitryKuzmenko) #1466
+	* Fixed IUS repo addresses (oeuftete) #1469
+	* Updated tests to assert target Python and Salt versions (s0undt3ch) #1470
+	* Fixed Amazon 2 -x support (s0undt3ch) #1470
+	* Fix Fedora stable installs for older releases (s0undt3ch) #1470
+	* Fix CentOS 8 installations (s0undt3ch) #1470
+	* Default Debian 10 to Py3 (s0undt3ch) #1470
+	* Fix Arch Linux installs (s0undt3ch) #1470
+
+Version 2020.02.24:
+	* Fix SLES 15 install (max298) #1431
+	* Fix 3000(Neon) stable install (sblaisot) #1433
+	* Fix Amazon Linux Py3 install (s0undt3ch) #1434
+
+Version 2020.02.04:
+	* Add support for the Salt Neon(3000) release (s0undt3ch) #1424
+	* Drop support for Fedora < 30 (s0undt3ch) #1424
+	* Drop support for Debian < 8 (s0undt3ch) #1424
+
+Version 2020.01.29:
+	* FreeBSD fixes (cedwards) #1413
+	* Support the upcoming Neon release (s0undt3ch) #1420
+
+Version 2020.01.21:
+    * FreeBSD fixes (kgbsd) #1376
+    * Fix macOS support (s0undt3ch) #1397
+
+Version 2019.11.04:
+    * Fix busybox mktemp compatibility (stanzgy) #1369
+    * Install debian 10 packages on debian 10 instead of 9 (kiemlicz) #1375
+    * move centos to python36, use python specified by -x (Ch3LL,bryceml) #1380
+    * Add debian 10 git install support (Ch3LL) #1378
+
+Version 2019.10.03:
+    * Fix possible typo with `gnupg-curl` vs `gnupg curl` (zahiar)
+    * Install only python3 packges if requested on ubuntu (noelmcloughlin) #1356
+    * Fixing debian wheezy (bryceml) #1359
+    * Fixed Amazon Linux 2 detection when lsb_release is installed (jars99) #1361
+    * Mac OS Support (felippeb) #1363 #1364 #1365 #1366
+
+Version 2019.05.20:
+    * Allow stable version selection for amazon linux (puluanau) #1328
+    * FreeBSD 12 support (sticky-note) #1329
+    * Apt wait for lock modification (ripesensor) #1335
+    * Opensuse 15 Git installation fixes (s0undt3ch) #1340 #1341
+    * Amazon Linux Image fixes (nshenry03) #1343
+    * apt_key_fetch fixes (greut) #1344
+    * CentOS Git and PIP installation m2crypto fixes (s0undt3ch) #1347
+    * CI process enhancements/fixes (s0undt3ch) #1347
+
+Version 2019.02.27:
+    * Add support for bunsenlabs devian derivative (kevinquinnyo) #1300
+    * Add support for TurnKey devian derivative (dafyddj) #1313
+    * Fix BSD develop install (hackacad) #1316
+    * Ensure python-concurrent.futures is installed for Ubuntu (garethgreenaway) #1321
+
+Version 2019.01.08:
+    * use official amazon linux 2 repo for amazon linux 2 (mchugh19) #1287
+    * Add release info to applicable docs (rallytime) #1292
+    * Modify wait_for_apt function (ripesensor) #1291
+    * Add support for LinuxMint 19 (darkocerdic) #1289
+    * FIX #1237 SmartOS should use pkgin show-deps (sjorge) #1283
+    * Fedora: Reduce DNF calls to 2 during install_dep phase (The-Loeki) #1278
+
+Version 2018.08.15:
+    * Add tests using kitchen-salt (gtmanfred) #1279
+    * Add python-futures to Py2 installs (gtmanfred) #1279
+
+Version 2018.08.13:
+    * Fedora Py3 fixes (The-Loeki) #1273
+    * Handle commented lines in the requirements files for pip pkgs (rallytime) #1271
+    * Remove typo: extra 'c' was accidentally added in #1269 (rallytime) #1270
+    * [Arch] Add python2-futures to list of pkgs on git install (rallytime) #1269
+    * Fix undefined variable warn_msg on amd64 (alexandruavadanii) #1268
+    * SLES12SP changed packages git to git-core and libzmq3 to libzmq4 (mfapouw) #1266
+    * Add opensuse 15 specific installation functions (rallytime) #1263
+    * Remove support for openSUSE Leap 42.2 (rallytime) #1262
+    * Remove support for Fedora 26 (rallytime) #1261
+    * Remove support for Ubuntu 17.10 (rallytime) #1260
+    * Ensure pipe is absent before mkfifo/mknod (noelmcloughlin) #1256
+    * fix for opensuse15 if no lsb_release pkg (noelmcloughlin) #1255
+    * Fix Up ShellCheck errors/warnings for latest version of shellcheck (rallytime) #1253
+    * Remove daily install option on Ubuntu system (icy) #1250
+    * Add python 3 support for Ubuntu 18 (rallytime) #1248
+    * Return immediately if apt-get fails (icy) #1247
+    * Disable shell error about unbound variable during daily install (icy) #1246
+    * OpenSuse_Leap_15.0 saltstack repo support (noelmcloughlin) #1244
+    * Add Python3 package support for Debian 9 (rallytime) #1243
+    * Add Python3 package support for CentOS 7 (rallytime) #1242
+    * Shellcheck fixes found when running latest version (rallytime) #1239
+    * Add Python3 package support for Ubuntu 16.04 (rallytime) #1238
+    * Fix the variable ref from #803 (rallytime) #1229
+    * Add Ubuntu 18.04 support (rallytime) #1228
+    * Call __git_clone_and_checkout directly (jheidbrink) #1226
+    * Fix for silently ignored version argument on CentOS/RHEL (pjcreath) #1210
+
+Version 2018.04.25:
+    * Install py-tornado4 for FreeBSD. (abednarik) #1219
+    * Remove COPR repos configuration for Fedora (vutny ) #1211
+    * Fix for silently ignored version argument on CentOS/RHEL (pjcreath) #1210
+    * Use integer parameter for sleep command (bdrung) #1205
+    * Add 2018.3 branch to list of stable options (rallytime) #1204
+    * If installing with -P, install tornado<5.0. (rallytime) #1203
+    * Add M2Crypto to python27 centos 6 bootstrap install (Ch3LL) #1201
+    * Update README to include mention of bootstrap-salt.ps1 for Windows (rallytime) #1200
+    * Port spelling fixes from change in Salt to Bootstrap (rallytime) #1199
+    * Add M2Crypto package back to git install functions (rallytime) #1198
+    * OpenBSD has a cdn which handles selecting the best mirror (jasperla) #1197
+    * Change gnupg2 pacakge to gnupg for non-LTS versions of Ubuntu (rallytime) #1196
+    * Install swig30 as freebsd dep instead of swig. (abednarik) #1191
+    * make salt-syndic optional on salt bootstrap (sybix) #1190
+    * Add __wait_for_apt function: avoid locking on the apt-get process (rallytime) #1186
+    * Update the README.rst file with some grammatical changes (rallytime) #1185
+    * Update Fedora support: 25 is EOL, 27 is supported (rallytime) #1184
+    * Add a note about the use of sudo when running commands to README (rallytime) #1183
+    * Adding support for minor release pinning on AWS Linux (cmclaughlin) #1182
+    * Wait for zypper processes to finish before calling zypper again (rallytime) #1181
+    * only install ca-certificates on opensuse if it isn't already installed (gtmanfred) #1179
+
+Version 2017.12.13:
+    * Use HTTPS URL for OpenSuse's saltstack repo (gdm85) #1174
+    * Respect disable repos (-r) option on OpenBSD (eradman) #1171
+    * Fix #1168 : -b option causes error (vutny) #1170
+    * Fix fatal error with using the -b option. (arizvisa) #1169
+    * Devuan support (ymasson) #1165
+    * Fix yum repo on AWS Linux (cmclaughlin) #1164
+    * Use suse repo to install packages, rather than defining them (rallytime) #1157
+    * Remove patch-level-1 specific code for SLES installs (rallytime) #1156
+    * priority sort fedora-release (toanju) #1153
+    * Declare EOL for SUSE Linux Enterprise Server releases (vutny) #1150
+    * Fix #1142: allow git install on Raspbian 9 (vutny) #1146
+    * Follow symlinks when parsing distro release files (vutny) #1145
+    * fedora: use dnf-utils for F26 and above (toanju) #1144
+    * Declare EOL for openSUSE LEAP 42.1 (vutny) #1143
+    * Fix #1137: import GPG key through an HTTP(S) proxy (vutny) #1139
+    * Fix #1138: git install on Debian/Ubuntu various arches (vutny) #1141
+    * Declare EOL for openSUSE releases earlier and including 13.X (vutny) #1136
+    * Update Fedora support: 24 is EOL (rallytime) #1134
+
+Version 2017.08.17:
+    * Add new authors (rallytime) #1130
+    * README: Fix typo and Table of Contents for Debian section (vutny) #1129
+    * Reduce the # of days an issue is stale to 6 months (rallytime) #1125
+    * Only install Python version if "-y" is defined (rallytime) #1124
+    * Allow powershell bootstrap script to specify PY2 or 3 (rallytime) #1123
+    * Remove the test that checks if the EPEL RPM was installed (amendlik) #1122
+    * added latest version string of nitrogen release 2017.7 (sourceindex) #1120
+    * use versions specified in base.txt when doing pip installs (aflat) #1116
+    * Remove pip install requirement on Fedora git installs (rallytime) #1114
+    * Introductory support for Debian 10 (Buster) (rallytime) #1113
+    * Add Debian 9 support using official repo.saltstack.com packages (rallytime) #1111
+    * Fix 1105 (vernondcole) #1110
+    * Move SUSE specific function closer to related code (vutny) #1107
+    * Update Authors file (rallytime) #1103
+    * Fix ubuntu 16.04 LTS installation (BlaineAtAffirm) #1102
+    * Add debian_codename_translation function, similar to Ubuntu (rallytime) #1101
+    * Add the CODE_OF_CONDUCT.md file (rallytime) #1100
+    * Update Debian and Ubuntu service file paths to be consistent with salt (rallytime) #1099
+    * Add hash verification information to installation instructions (rallytime) #1098
+    * Fix installing salt-cloud package on Arch Linux (rallytime) #1097
+    * Support bootstrapping on upcoming Debian GNU/Linux 9.0 (vutny) #1096
+    * Removes faulty explicit version ordering (absolutejam) #1095
+    * Remove configuring EPEL repo for Amazon Linux (vutny) #1093
+    * Fix -j/-J (JSON configs) options for Debian 8 (vutny) #1092
+    * Fix #1035: detect and log errors earlier (vutny) #1091
+    * Update AUTHORS file (rallytime) #1089
+    * Autounmask as separate step (decomposite) #1088
+    * Ensure presence of CONFIG_PROTECT_MASK files (decomposite) #1087
+    * Update Fedora support: 23 is EOL now. (rallytime) #1084
+    * Fix the -R option on Debian/Ubuntu (rallytime) #1082
+    * Declare End-Of-Life for Ubuntu 12.04 LTS (vutny) #1080
+
+Version 2017.05.24:
+    * Use freebsd repo to query for salt dependencies (Ch3LL) #1076
+    * Allow amazon to work with python2.7 on installs over 2016.11 (Ch3LL) #1073
+    * ensure sles12 enables services with stable installs (Ch3LL) #1075
+    * Declare End-of-Life for RHEL 5 and its variants (vutny) #1070
+    * Fix configuring SaltStack's repo URL for RHEL variants (vutny) #1068
+    * Add Manjaro as Arch derivative (luthes) #1063
+    * Add "unmarkComment" option to probot-stale config (rallytime) #1064
+    * Properly detect all supported Debian GNU/Linux derivatives (vutny) #1062
+    * Archlinux must always update (gtmanfred) #1060
+    * Alpine: fix adding, checking and running Salt Syndic in stable mode (vutny) #1059
+    * Add KDE neon... (EHJ-52n) #1058
+    * Update probot-stale message formatting. (rallytime) #1057
+    * Fix `git` bootstrap mode for CentOS (vutny) #1054
+    * update install_freebsd_10_stable to use FreeBSD repo (bytesatwork-xx) #1053
+    * Support OpenBSD 6.1 (eradman) #1048
+    * Update daysUntilStale value in probot-stale config (rallytime) #1055
+    * Add ability to install and use a different python version when installing salt (Ch3LL) #1049
+    * Add non-LTS type support for Ubuntu 17.04 (rallytime) #1051
+    * Allow -R option to work for Debian/Ubuntu (rallytime) #1045
+    * Adjust "daysUntilStale" variable to 190 days. #1047
+    * Reduce the number of days an issue is considered "stale" (rallytime) #1046
+    * Alpine: fix bootstrapping from Git -- install OpenRC initscripts (vutny) #1044
+    * Add probot-stale config file (rallytime) #1042
+    * Shallow cloning and Python setup fix for BSD (amontalban) #1040
+    * Fix not needed quoting for salt/salt-bootstrap#1026 (amontalban) #1039
+    * Update README file with supported release documentation (rallytime) #1034
+    * Remove <<< bashism (The-Loeki) #1032
+    * [-R option] Fix logic error where we trying to enable epel with -R (rallytime) #1033
+    * Alpine: check Salt services have been enabled to start on boot (vutny) #1031
+    * AWS Linux Native Support (bkruger99) #1022
+    * Correct package name for FreeBSD installation (amontalban) #1030
+    * README: describe architectures support for Salt deps on Linux distros (vutny) #1029
+    * This commit addresses some of the issues in salt/salt-bootstrap#996 (amontalban) #1026
+    * Add support for stable installation on Alpine Linux release 3.5 (vutny) #1028
+    * Alpine Linux: fix installation of multiple pkgs ("stable" bootstrap) (vutny) #1027
+    * Add Void Linux support (ndrwdn) #1025
+    * RHEL6: disable stdin to fix shell session hang on killing tee pipe (vutny) #1018
+    * Adding 2016.11 to stable version (ashokrajar) #1017
+    * Update bootstrap-salt.sh (caelor) #1015
+    * Alpine Linux support #1009 (ek9) #1010
+    * Add Table of Contents in README (vutny) #1014
+
+Version 2017.01.10:
+    * Update AUTHORS.rst with new contributors (rallytime) #1011
+    * fix bootstrap in Arch Linux by updating package name from salt-zmq to salt (ek9) #1007
+    * Add python-systemd package to debian 8 git install (rallytime) #1003
+    * Updated supported versions for Ubuntu: 12.04, 14.04, 16.04, and 16.10 (best effort) (rallytime) #1002
+    * Add "yakkety" to ubuntu_codename_translation function (rallytime) #1001
+    * Update supported versions for Fedora: 23, 24, and 25. (rallytime) #1000
+    * Handle renaming of gnupg-curl to gnupg1-curl for Ubuntu 16.10 (marco-m) #998
+    * fix systemctl path (dmitrievav) #997
+    * Drop unnecessary workarounds (creating directories) for early releases (vutny) #995
+    * Let's detect newly released Salt 2016.11 stable release (vutny) #994
+    * Adjust code examples to use the actual bootstrap-salt.sh file name (rallytime) #993
+    * Install TLS certs before cloning git repo via https (vutny) #991
+    * Remove fix me comment and fix systemsmanagement link (rallytime) #990
+    * Correct usage description about "config only" mode (vutny) #989
+    * Fix overwriting Minion config from temporarily directory (vutny) #988
+    * Configure Salt components after the dependencies installation (vutny) #987
+    * Add CloudLinux support (rallytime) #986
+    * Apply the insecure flag to git as well (cachedout) #981
+
+Version 2016.10.25:
+    * Update AUTHORS.rst with new contributors (rallytime) #978
+    * Let's start detecting the upcoming Debian 9 (Stretch) (lhost) #975
+    * FreeBSD: set _SALT_ETC_DIR directory to match ports (eradman) #970
+    * Update OpenBSD 6.0+ provisioning (eradman) #969
+    * adds supports for Cumulus Linux (plumbis) #967
+    * Run "pip install -U futures" for SmartOS git install (rallytime) #966
+    * Change /pkg/rpm/ to /pkg/deb/ in install_ubuntu_git_post func (rallytime) #965
+    * SUSE: Refactor systemsmanagement_saltstack repo checks to be DRY (rallytime) #964
+    * Fix detection of EPEL repository with not-expired metadata (sp1r) #963
+    * Display warning message about deprecating the `-G` option (vutny) #958
+    * Allow correct salt paths to be used when -c is passed (justinta) #955
+    * Fix issues with replacing configs when python3 is default in os. (fizmat) #954
+    * Remove m2crypto package installs (rallytime) #951
+    * Try to install SP4 packages on SLE 11 when SP version is older (rallytime) #950
+    * Add python-futures package to install_centos_git_deps (rallytime) #948
+    * Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK (rallytime) #947
+    * Deprecate `-G` option: use `https` scheme for GitHub by default (vutny) #945
+    * [SECURITY] Properly handle GnuPG keys for APT repositories (vutny) #940
+
+Version 2016.08.16:
+    * Ubuntu git mode: install all deps from SaltStack corp repo by default. (vutny) #936
+
+Version 2016.08.15:
+    * Remove chris-lea python-zmq repo. (rallytime) #929
+    * Disable the '--enablerepo=${_EPEL_REPO}' part of yum install cmds when passing -R/-r. (rallytime) #928
+    * Fix grep pattern in `__check_services_sysvinit`. (vutny) #927
+    * Missing python dependency for salt-cloud added. (toanju) #925
+    * Fix git install mode when using commit hash with `-g` option. (vutny) #922
+    * Install `salt-cloud` package with `-L` option in `stable` mode. (vutny) #919
+    * Fix bootstrapping from Git on CentOS7 when `systemd` is not running. (vutny) #915
+
+Version 2016.07.07:
+    * Add new contributors to authors list. (rallytime) #910
+    * Split up python-requests and python-msgpack packages for newer Fedora. (rallytime) #909
+    * Fix typo in repository configuration for FreeBSD. (ekollof) #907
+    * Make sure $STABLE_REV is set before setting up SaltStack repo. (rallytime) #906
+    * Remove tests written question from template. (rallytime) #904
+    * Adding support for Linux Mint 18 (based on Ubuntu 16.04). (eliezerlp) #902
+    * Allow git installation for SLES 12. (rallytime) #903
+    * Set repo_arch for raspberry pi installs. (mrichar1) #899
+    * Change temporary directory for storing executable to C:\Windows\Temp. (themalkolm) #897
+    * add apt-transport-https for ubuntu. (epcim) #896
+    * Fix expanding shell script position parameters with nounset enabled. (vutny) #895
+    * RFC: Add tests for bootstrap-salt.ps1. (themalkolm) #893
+    * Keep original name of salt executable executable. (themalkolm) #857
+
+Version 2016.06.27:
+    * Fix race condition when doing one-liner bootstrap. (vutny) #889
+    * Add space back in between 'install' and '--install'. (rallytime) #890
+
+Version 2016.06.24:
+    * Save invocation command and arguments into variables. (jfindlay) #885
+    * Update the authors list with new contributors. (rallytime) #884
+    * Add option to make setup.py install quiet. (nasenbaer13) #865
+    * Fix lint. (jfindlay) #881
+    * Add -R option to allow a custom repo URL. (rallytime) #877
+    * Exclude path of script when called from another dir. (l2ol33rt) #871
+    * Print invocation info. (jfindlay) #869
+    * Always refresh the Arch Linux keyring if needed. (cachedout) #868
+    * Ubuntu 16.04 LTS Xenial Support. (notpeter) #852
+    * Install Salt packages from repo.saltstack.com on Debian 7 "Wheezy". (vutny) #864
+    * Drop support for Debian 6 old-old-stable "squeeze": reached end-of-life. (vutny) #860
+    * Removed ubuntu version restriction for apt-get update. (marccardinal) #859
+    * Fix bootstrapping from git on Debian 8 by installing latest `tornado` via pip. (vutny) #828
+    * Add the ability to override master and/or minion configs from CLI. (rallytime) #841
+    * Don't sleep 11 seconds if the user allowed overwrite of config files. (poelzi) #832
+
+Version 2016.05.11:
+    * Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it. (rallytime) #848
+
+Version 2016.05.10:
+    * Removed libzmq4 and forking-deamon-patch for Opensuse13. (jtand) #840
+    * Ubuntu 12.04 needs to be updated before installing packages. (jtand) #829
+    * Always download and install *latest* `epel-release` package on RHEL systems. (vutny) #825
+    * Fix Amazon Linux EOL check. (vutny) #818
+
+Version 2016.04.18:
+    * Add support for openSUSE Leap. Thanks Roman Inflianskas(rominf). #693
+    * Fix missing deps installation on Debian. Thanks  Steve Groesz(wolfpackmars2). #699
+    * Update SaltStack repo location and latest version for Windows. (brandon099) #711
+    * Better EPEL repository detection on RHEL and CentOS. (vutny) #717
+    * Fix git invocation fail when `man` command is not available. (vutny) #718
+    * Fix `epel-release` package installation on CentOS/RHEL 5. (vutny) #719
+    * Removed deprecated cli option. (abednarik) #705
+    * Remove RHEL optional repo check and enable. (vutny) #720
+    * Remove SaltStack COPR repository configuration for CentOS/RHEL5. (vutny) #721
+    * Add opensuse_Tumbleweed support. (aboe76) #725
+    * Sometimes bootstrap doesn't install zmq. (jtand) #726
+    * Process -s (default sleep for service restarts) in bootstrap-salt.sh. (hipikat) #692
+    * Minion keys and /etc/salt/minion should be overwritten on -C. (cro) #541
+    * Fix for -C (_CONFIG_ONLY). (beaucephus) #544
+    * Fix when using upstream tags. (The-Loeki) #564
+    * COPR project moved. (rmohr) #738
+    * Update license year range. (pra85) #743
+    * Use POSIX-Compliant Command-Exists Test. (kojiromike) #741
+    * Add -f option to force shallow cloning. (eyj) #660
+    * add SLE 12 support, fix OpenSUSE support. (grep4linux) #748
+    * Fix CentOS git setup.py syntax error upon installation. (The-Loeki) #746
+    * Enable shallow cloning for version branches by default, not only tags. (vutny) #750
+    * do not install copr repo on fedora 22+. (toanju) #751
+    * Add support for pegged versions on YUM based OS'ses through repo.saltstack.com. (The-Loeki) #685
+    * fix for FreeBSD 11 CURRENT install functions. (serge-p) #723
+    * Don't add zypp repo if it already exists. (furlongm) #731
+    * switch repositories for suse and sles fixes `#706`_. (aboe76) #734
+    * Reformat and correct usage instructions. (vutny) #755
+    * fixed missing repo for suse 12. (aboe76) #756
+    * fix for Amazon Linux. (shawnbutts) #700
+    * adding support for OpenBSD distribution. (serge-p) #722
+    * fixing syntax errors. (beardedeagle) #760
+    * Import CentOS 7 GPG key on RHEL for installing base dependencies from Salt corp repo. (vutny) #765
+    * Fix multiple lint errors (shellcheck) and make some refactoring. (vutny) #768
+    * Fix sleep time option to recognize a numeric argument. (vutny) #771
+    * Update README. (vutny) #787
+    * get tornado from pip on a fedora git install. (jfindlay) #785
+    * Remove the Saltstack repo's alias. (cro) #794
+    * Ability to change cache dir. (clarkperkins) #761
+    * Add config_freebsd_salt func so freebsd puts cfgs in the right place. (ryanwalder) #779
+    * Allow archive versions. (clarkperkins) #769
+    * Lack of HTTPS for RPM packages. (jaredestroud) #783
+    * Ability to change cache dir. (clarkperkins) #761
+    * Bootstrap on Docker. (vutny) #793
+    * add downstream pkg repo for SUSE. (jfindlay) #791
+    * Fixed use of HTTP over HTTPS for anonscm.debian.org. (gdm85) #788
+    * Bump Salt version to latest stable in PS bootstrap script for Windows. (vutny) #801
+    * Add an -l option to switch https to http links. (rallytime) #795
+    * Virtualenv support for Ubuntu. (l2ol33rt) #666
+    * Lint. (jfindlay) #805
+    * use portable command check. (jfindlay) #806
+    * Update epel-release version number (RuriRyan) #809
+
+
+Version 2015.11.09
+    * Make sure that wget is installed. #868
+
+
+Version 2015.11.04:
+    * Allow bypassing dependencies installation. Thanks EYJ. #656.
+    * Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). #653
+    * Move RHEL installations to use repo.saltstack.com #674
+    * Move Debian 8 installation to use repo.saltstack.com #674
+    * Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). #654
+    * Move Ubuntu 12 and 14 installations to use repo.saltstack.com #674
+    * Move FreeBSD installations to use repo.saltstack.com #674
+    * Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). #665
+
+
+Version 2015.08.06:
+    * Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633
+    * Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
+    * Exit the git checkout directory before deleting it. Thanks Bret Fisher. #634
+    * Use prefix /usr for centos git install. Thanks Stanislav B. #638
+    * Drop Ubuntu EOL versions. All Ubuntu version before 12.04.
+    * Make sure python-dev is installed wheb trying to install tornado from PyPi. #640
+
+
+Version 2015.07.22:
+    * Fix tornado installation in Ubuntu. Thanks Yushi Nakai. #627
+    * Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
+    * Install requests on Ubuntu from Chris Lea's PPA. #630
+
+Version 2015.07.17:
+    * Make sure setuptools is installed before using it. #598.
+    * `systemd` is only fully supported from 15.04 onwards. #602
+    * Fix debian mirrors issue. Thanks Wolodja Wentland(babilen). #606
+    * Fix python-jinja2 repo move on RHEL6. Thanks lomeroe. #621
+    * Allow skipping services. Thanks denmat. #455
+    * Fix missing Debian init script. #607 saltstack/salt#25270 and saltstack/salt#25456
+    * Fix SmartOS etc path. Thanks Bret Fisher. #624
+    * Fix possible unbound variable in Gentoo. #625
+    * Properly detect the git binary in SmartOS. #611
+
+Version 2015.05.07:
+    * Lower required requests version dependency. Use system requests package where possible.
+    * Allow Ubuntu alternate ppas. Thanks Peter Tripp(notpeter). #563
+
+Version 2015.05.04:
+    * Fix the configuration path for FreeBSD. #567/#552. Thanks Ronald van Zantvoort(The-Loeki).
+    + Fix non grouping support in POSIX sed. Thanks Ronald van Zantvoort(The-Loeki).
+    * Add Debian 8 support. Thanks Matt Black(mafrosis)
+    * Improve Debian version parsing. Thanks Mark Lee(malept)
+    * Make sure we update packages list one Chris Lea's PPA repository is added.
+    * Hard code the Debian Squeeze backports to the DE mirror since the main repository is down.
+    Thanks @panticz. #589.
+    * Only install git if not already installed. #560
+    * Fix openSUSE 13.2 where we need to pass --replaceflags. Thanks Roman Inflianskas(rominf).
+    #504.
+    * Make sure that a recent enough requests package is installed in Debian/Ubuntu.
+    * Install tornado on git installs for the develop branch if necessary. #580
+    * Add support for Ubuntu 15.04
+
+Version 2015.03.15:
+    * Add multi-master support. Thanks Fred Reimer(freimer). #555
+
+Version 2015.03.04:
+    * Fix the salt package selection on Arch stable installs.
+
+Version 2015.02.28:
+    * Fix Debian backports repository.
+
+Version 2015.02.27:
+    * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van
+    Zantvoort(The-Loeki)
+    * No need to install packages from the Unstable repository for debian, use backports. Thanks
+    Ari Aosved(devaos)
+    * Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a
+    separate package). Thanks Ronald van Zantvoort(The-Loeki)
+    * Enable the server-optionals repository for RHEL >= 7
+    * RHEL/CentOS 5 now uses the COPR repository. #533
+
+Version 2015.01.12:
+    * Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl).
+    * Make sure wget is installed on debian bare systems.
+    * Make sure the Arch pacman database is up to date
+    * Install `python-hashlib` in CentOS 5 in order to use the COPR repository
+
+Version 2014.12.11:
+    * Enable binary installations on CentOS 7. Thanks ggillies
+    * Updated the URL for EPEL 7
+
+Version 2014.10.30:
+    * Apply the forking patch to openSUSE git installations.
+
+Version 2014.10.28:
+    * Install the python systemd bindings for Arch and Fedora git installations
+    * Allow cloning from Salt's git repository using HTTPS. #475
+
+Version 2014.10.21:
+    * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha)
+    * Fix syndic installation on RHEL based installations. Thanks markgaylard
+    * Properly detect the git checkout `basename` directory instead of hard coding it. Thanks
+      Howard Mei(HowardMei).
+    * Allow installing ZMQ for SaltStack's COPR repository.
+    * Allow installing ZMQ4/PyZMQ14 from Chris Lea's PPA repository.
+
+Version 2014.10.14:
+    * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag
+    * Distro Support Added:
+        * Added Linux Mint 17 support(Thanks Skyler Berg)
+    * Disrto Suuport Fixed:
+        * Init pacman keys if not done so previously
+
+Version 2014.09.25:
+    * Properly detect Amazon AMI's >= 2014.9. #468
+
+Version 2014.09.09:
+    * Distro Support Fixes:
+        * Updated the URL for EPEL 7
+        * PIP based installations on Ubuntu 10.04 need setuptools installed
+        * Arch stopped providing the version information on `/etc/arch-release`
+        * Complete `salt-api` services checking. #450
+
+Version 2014.08.30:
+    * Skip service checks for `salt-api`, since this should be an opt-in service not necessarily
+    meant to start at boot time.
+    * Distro Support Fixes:
+        * Also install the salt-api service on RHEL based distributions for git based
+        installations.
+        * Properly detect Arch Linux when lsb-release is available
+        * Updated the URL for EPEL 7
+
+Version 2014.08.23:
+    * Avoid redirect breakage when installing EPEL with rpm on RHEL 5
+    * Ensure python-apt is installed by the bootstrap script for Debian & Ubuntu minions. Thanks
+    @garethgreenaway.
+    * Don't shallow clone on git versions lower than 1.7.10
+    * Only shallow clone on git tag based installations
+    * Configurable Salt repository clone directory for git based installations
+    * Distro Support Fixed:
+        * Fixed the URL to download EPEL for Cent 5
+        * Use the full path to the `chkconfig` binary when checking for services in SysV init
+        systems.
+        * Fixed an issue where the default sleep period(3 secs) on Ubuntu would cause a race
+        condition with upstart wherein the package installation would call an upstart start and
+        before it could complete, bootstrap would call another. The result was *two* copies of salt
+        running which ended up causing a most stubborn bug that's documented in
+        https://github.com/saltstack/salt/issues/12248
+
+Version 2014.07.29:
+    * Shallow clone Salt's repository for speed improvements. In case of failure, resume old
+    behaviour.
+    * Fixed bug introduced in 0577622 when salt-api service install and checks were added
+    * Distro Support Fixed:
+        * Fixed infinite loop when handling RHEL dependencies. Thanks Dan Mick(@dmick).
+
+Version 2014.07.27:
+    * Amazon Linux AMI 2010.xx is not explicitly not supported.
+    * Install the `salt-api` scripts if available when the `salt-master` is also installed.
+    * Added support for a configurable sleep time when starting, restarting and checking for
+    enabled services.
+    * Drop the `tsflags` requirement for RHEL and RHEL based distributions.
+    * When sorting release files, oracle-release has higher priority than redhat-release.
+    * Distro Support Fixed:
+        * Debian >= 7 uses system's python-requests package, not PIP
+        * Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
+        * Only install EPEL on requiring distributions if not already installed
+        * CentOS 7 now uses systemd and the script now properly handles it
+        * systemd in openSUSE 12.2 complains if service does not contain `.service``
+        * Properly detect openSUSE using `lsb_release
+        * SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will
+        be asked which we want to install, even with --non-interactive. Let's try to install the
+        higher version first and then the lower one in case of failure.
+        * Allow some extra time on RHEL for the optionals repo check in case the repository
+        subscription is being managed externally.
+
+Version 2014.06.30:
+    * Distro Support Fixed:
+        * Bump build/maintenance version for epel-release package. Thanks Gregory Meno(GregMeno)
+        * Properly detect Amazon Linux AMI when using `lsb_release`
+        * Fix `tsflags` installation.
+
+Version 2014.06.28:
+    * Fixed `tsflags` packages detection for RHEL and Oracle Linux 6.5
+
+Version 2014.06.21:
+    * Also export the HTTPS proxy environment variable. Thanks Giuseppe Iannello(gianello).
+    * Distro Support Fixed:
+        * Improve Oracle Linux Server detection
+        * Overcome the Oracle Linux awkwardness. `--enablerepo=XYX` disables ALL OTHER REPOS!!!!
+        * Oracle Linux also support testing repositories installation
+
+Version 2014.06.19:
+    * Allow passing the master address as an environment variable, `BS_SALT_MASTER_ADDRESS`
+    * Fixed an issue with the keys pre-seed. We were passing absolute paths where we only needed
+    basenames.
+    * Added HTTP proxy configuration support. Thanks Giuseppe Iannello(gianello),
+    * Distro Support Added:
+        * Elementary OS
+        * RHEL 7 Beta/RC
+        * Kali Linux. Thanks Valentin Bud(valentinbud)
+    * Distro Support Fixed:
+        * Improved RHEL optionals repository detection
+
+Version 2014.04.16:
+    * Fixed a bug for RHEL 6 based distributions where yum-utils was not getting installed.
+    * Added minor version check for RHEL 6 optional channel.
+    * Added quotes around "apache-libcloud>=$_LIBCLOUD_MIN_VERSION" for proper version requirements
+    handling.
+    * Install the python 'requests' package which is now a hard dependency in Salt.
+    * When installing from a user defined repository add the official one as a remote and fetch
+    its tags for proper versioning.
+    * Distro Support Fixed:
+        * CentOS netinstall ISO's don't install `chkconfig`
+        * Improved RHEL optional repository detection. This allows user repository usage, which
+        don't need the optional repository support since they usually provide their packages.
+    * Distro Support Added:
+        * Oracle Linux
+        * Scientific Linux
+
+Version 2014.03.10-1:
+    * Distro Support Fixed:
+        * Fix the Debian services running function
+
+Version 2014.03.10:
+    * Debian based distributions which don't use upstart now also check if the salt services are
+    enabled.
+    * Distro Support Fixed:
+        * RedHat based distributions now have a proper services enabled checker.
+
+Version 2014.02.27:
+    * Fixed a bug on the services enabled function searching logic.
+    * Arch, Fedora, openSUSE and SuSE now check for services enabled, if using systemd
+    * CentOS(and any RedHat based) and Ubuntu now check for services enabled is using upstart
+    * Distro Support Added:
+        * Debian 8. Thank You Boris Feld(Lothiraldan).
+
+Version 2014.02.19:
+    * Fixed a problem with the quotes of an error message
+    * Arch installations now uses the community repository
+    * Distro Support Fixed:
+        * Fixed Fedora Git based installations(git was not being installed)
+
+Version 2014.02.18:
+    * Debian based distribution now get a warning stating that NOT starting daemons does not work
+    as supposed, mainly because that's the Debian policy.
+    * Fix bug introduced when implementing the master ip flag. The default minion includes
+    directory is `minion.d`, not `minion.conf.d`
+
+Version 2014.02.16:
+    * The script now allows setting up the salt-master address as a separate configuration file by
+    passing `-A` to the script.
+    * Add support to install apache-libcloud by passing the `-L` flag. In some distribution it's
+    also needed to pass `-P` because the minimal apache-libcloud version is `0.14.0`. This support
+    is still missing for FreeBSD and SmartOS.
+    * Fixed an issue when copying or moving files. We now test to see if the destination is a
+    directory and create a full path from that so that the "do not override" logic works as
+    supposed. #294.
+    * Allow passing additional package names to install while installing Salt's dependencies. #262
+    * Pass the salt configuration directory, default or from environment variable to the setup.py
+    script for git based installations. #305
+    * Distro Support Fixed:
+        * FreeBSD `fetch` now has a notion of insecure certificates. Handle this properly. Thank
+        You Mike Carlson(m87carlson).
+        * Arch, openSUSE and SuSE are now upgradable when the `-U` flag is passed.
+        * Force overwrites now works for existing init.d scripts on CentOS git installations. #259
+    * Distro Support Added:
+        * FreeBSD 10 is now also supported. Thank You Mike Carlson(m87carlson).
+        * Red Had Enterprise Workstation is now supported.
+
+Version 1.5.11:
+    * Fixed an out of scope variable missed when moving functions around.
+
+Version 1.5.10:
+    * Salt no longer has the master branch in git, install from develop as default.
+    * Installing from Git on Red Hat based distributions now also needs `yum-utils` installed.
+    * Allow the script to use a different git repository to install from.
+    * Fixed a bug where a branch name with dashes would be wrongly detected as an option to the
+    script.
+    * Default to secure file downloads(if any).
+    * Distro Support Fixed:
+        * Minimal Ubuntu installation might not have upstart installed, fixed.
+        * FreeBSD now uses the official FreeBSD repository. Thank You Paul Brian(lifeisstillgood)!
+
+Version 1.5.9:
+    * Allow to not start the daemons after bootstrapping salt. This will allow `vagrant-lxc`
+    installations,  `debootstrap*`, etc, to finish properly. Thanks Henrik Holmboe (holmboe).
+    * Distro Support Fixed:
+        * Salt >= 0.17 requires ElementTree which is on the python standard library after python
+        2.6 but openSUSE split that into a separate package.
+        * Fixed a logic preventing proper Ubuntu bootstrapping on some situations.
+
+Version 1.5.8:
+    * Fixed an Ubuntu regression. `add-apt-repository` is only available on
+    `software-properties-common` after 12.10, inclusive. Thanks Diego Woitasen(diegows)
+
+Version 1.5.7:
+    * For RedHat based distributions which rely on `epel`, the user can now pass `testing` to the
+    script and `epel-testing` shall be used to bootstrap salt and it's dependencies.
+    * No full system upgrades, if optional by the distribution, shall be done unless `-U` is passed
+    to the bootstrap script(required upgrade procedures must exist on the script, currently Debian
+    and RedHat based distributions support system upgrades).
+    * Fixed an issue where passing BS_KEEP_TEMP_FILES=1 to the script was causing an error. #206.
+    * Switched FreeBSD default packages repository to PCBSD(http://www.pcbsd.org) and added
+    multiple repository support to install salt from the SaltStack's FreeBSD repository.  Thanks
+    Christer Edwards(cedwards).
+    * Improved Gentoo Support. Thanks Elias Probst(eliasp).
+    * Stop execution soon for end of life distributions or non supported distribution versions.
+    * Distro Support Fixed:
+        * Fixed an unbound variable while bootstraping Gentoo.
+        * Fixed CentOS/RHEL 5.
+        * Fixed crypto++ compilation. Thanks Kenneth Wilke(KennethWilke)!
+        * Fixed FreeBSD git installations not pointing to the proper salt configuration directory,
+        which on FreeBSD is '/usr/local/etc/salt'.
+        * Fixed testing installation for Red Hat based distributions. Thanks Jeff Strunk(jstrunk)
+        * Fixed wrong package name on Arch. Thanks Niels Abspoel(aboe76)
+        * Make sure the Ubuntu universe repository is enabled. Thanks Karl Grzeszczak(karlgrz).
+        * Fixed SmartOS installation. Thanks Matthieu Guegan(mguegan).
+
+Version 1.5.6:
+    * If there's a `grains` file on the provided temporary configuration directory, move it to the
+    proper place while moving the minion configuration file.
+    * Gentoo bootstraps can now use a bin host to provide binary packages, just set the
+    `BS_GENTOO_USE_BINHOST` environment variable.
+    * If `BS_KEEP_TEMP_FILES=1` is found on the environment, the script will copy the files instead
+    of moving them.
+    * There were still some `mv` and `cp` occurrences which were not using their `{move,copy}file`
+    replacements which ended up on now respecting the "Do not override existing configuration"
+    feature.
+    * Distro Support Fixed:
+        * Arch now upgrades it's system package properly as suggested on their mailing list.
+        * Arch now moves back any configuration files provided by the user renamed by pacman on the
+        installation process.
+        * Fixed SmartOS detection(was being detected as Solaris) and bootstrapping. Fixed SmartOS
+        different gcc package names for different package sets.
+        * Fixed FreeBSD git based installations(no rc.d scripts were available).
+        * Fixed FreeBSD not re-evaluating the `PKI_DIR` variable since the `SALT_ETC_DIR` was
+        redefined.
+    * Distro Support Added:
+        * Linux Mint. Thanks Alex Van't Hof(alexvh)!
+        * Linaro.
+
+
+Version 1.5.5:
+    * Fixed a variable error in the new pre-seed feature.
+    * Fixed the destination path to where the pre-seed minions keys should be copied.
+    * Debian installations now use SaltStack's repository.
+    * Configuration files can now be passed as an URL to a compressed file. Thanks Geoff Garside!
+    * Distro Support Fixed:
+        * Debian's optional ZMQ3 support was fixed (libzmq3 has moved from experimental to
+        unstable).
+        * Ubuntu Lucid Daily PPA
+        * SmartOS no longer ignores $SALT_ETC_DIR. Matthieu Guegan!
+        * FreeBSD no longer ignores $SALT_ETC_DIR. Thanks Geoff Garside!
+        * FreeBSD does not try to install pkgng if pkg is installed. Thanks Geoff Garside!
+        * SunOS (Make use of XPG4 binaries on SunOS). Thanks Matthieu Guegan!
+        * openSUSE (Don't fail if only one of the repositories failed to update)
+        * Arch (Fixed the GPG issues for git installations)
+    * Distro Support Added:
+        * Gentoo. Thanks kaithar!
+
+
+Version 1.5.4:
+    * Fixed an issue we had when /proc/cpuinfo had more than one CPU. Detected on AMD CPUs.
+    * OpenSUSE 12.3 uses lsb_release. Fix the returned distro name "openSUSE project" to "openSUSE"
+    which the script handles.
+    * Added an custom move function which will only override if required and if we permit it.
+    * Implemented the necessary function to pre-seed minion keys on a salt master as an optional
+    argument.
+    * Distro Support Fixed:
+        * FreeBSD (Don't let the script fail if PACKAGESITE is not set)
+        * Debian Stable installations (the function search was not working as supposed)
+    * Distro Support Added:
+        * Ubuntu 13.04 (Was disabled because of a bad beta1. Fixed in beta2)
+
+
+Version 1.5.3:
+    * Return 0 or 1 from functions
+    * Convert several pipes into a single awk call
+    * Fixed `/etc/os-release` parsing
+    * Fixed `config_salt()`
+    * Distro Support Fixed:
+        * EPEL-based installations (CentOS, Amazon Linux, RedHat)
+        * SuSE/OpenSUSE (problem running the script twice, ie, existing `devel_languages_python`
+        repository)
+        * SuSE 11 SP1 (pip based install and config trigger)
+    * Distro Support Added:
+        * Debian 7 (Only git installations at the moment)
+
+
+Version 1.5.2:
+    * Fix issue with Travis testing (it installs it's own ZeroMQ3 lib
+    * Allow setting the debug output from an environment variable
+    * Fix an escape issue in the `printf` calls used in our echo calls
+    * Don't overwrite files (`config`, `init.d`, etc). Use a specific flag to force overwrites.
+    * Distro Support Fixed:
+        * Ubuntu daily installs.
+    * Distro Support Added:
+        * Trisquel 6.0 (Ubuntu 12.04)
+
+
+Version 1.5.1:
+    * Improved unittesting.
+    * Starting daemons.
+    * Make sure that daemons are really running.
+    * For the users to make the choice if installing from PIP (if required since there aren't system
+    pacakges).
+    * Fixed salt's git cloning when the salt git tree is already present on the system.
+    * Distro Support Fixed:
+        * Debian 6
+        * Ubuntu 12.10
+        * CentOS
+    * Distro Support Added:
+        * SuSE 11 SP1/11 SP2
+        * OpenSUSE 12.x
+
+
+Version 1.5:
+    * First stable version of the script
+    * Support for:
+        * Ubuntu 10.x/11.x/12.x
+        * Debian 6.x
+        * CentOS 5/6
+        * Red Hat 5/6
+        * Red Hat Enterprise 5/6
+        * Fedora
+        * Arch
+        * SmartOS
+        * FreeBSD 9.0
+
+
+# Don't remove the line below.
+# vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want ts=4

README.rst

@@ -37,9 +37,6 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
-- 2025.02.24: ``a0e3a58fc6358a7c6f708ee4910229e72fbdab7161819514b0696146a2edb62d``
-- 2024.12.12: ``7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd``
-- 2024.12.09: ``44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d``
 - 2024.11.29: ``0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0``
 - 2024.11.27: ``e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0``
 - 2024.11.26: ``832c7a20b96e1df171d715323df9afff8a11aef42d15598c007f240bc89d723c``
@@ -375,7 +372,7 @@ Using ``PowerShell`` to install latest stable version:
 
   [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12'
   Invoke-WebRequest -Uri https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.ps1 -OutFile "$env:TEMP\bootstrap-salt.ps1"
-  Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force; & "$env:TEMP\bootstrap-salt.ps1"
+  Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser & "$env:TEMP\bootstrap-salt.ps1"
 
 Display information about the install script parameters:
 

bootstrap-salt.ps1

@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2025.02.24"
+$__ScriptVersion = "2024.12.09"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements

bootstrap-salt.ps1.sha256

@@ -0,0 +1 @@
+839c02a7a850c880ff7f01befe591328bc5a65f668209be7230e0297a4b46262

bootstrap-salt.sh

@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2025.02.24"
+__ScriptVersion="2024.12.09"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -2161,19 +2161,21 @@ __git_clone_and_checkout() {
         fi
 
         if [ "$__SHALLOW_CLONE" -eq $BS_TRUE ]; then
-            # Let's try 'treeless' cloning to speed up. Treeless cloning omits trees and blobs ('files')
+            # Let's try shallow cloning to speed up.
-	    # but includes metadata (commit history, tags, branches etc.
+            # Test for "--single-branch" option introduced in git 1.7.10, the minimal version of git where the shallow
-            # Test for "--filter" option introduced in git 2.19, the minimal version of git where the treeless
             # cloning we need actually works
-            if [ "$(git clone 2>&1 | grep 'filter')" != "" ]; then
+            if [ "$(git clone 2>&1 | grep 'single-branch')" != "" ]; then
-                # The "--filter" option is supported: attempt treeless cloning
+                # The "--single-branch" option is supported, attempt shallow cloning
                 echoinfo "Attempting to shallow clone $GIT_REV_ADJ from Salt's repository ${_SALT_REPO_URL}"
-                echodebug "git command, git clone --filter=tree:0 --branch $GIT_REV_ADJ $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
+                ## Shallow cloning is resulting in the wrong version of Salt, even with a depth of 5
-                if git clone --filter=tree:0 --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
+                ## getting 3007.0+0na.246d066 when it should be 3007.1+410.g246d066457, disabling for now
+                ## if git clone --depth 1 --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
+                echodebug "git command, git clone --branch $GIT_REV_ADJ $_SALT_REPO_URL $__SALT_CHECKOUT_REPONAME"
+                if git clone --branch "$GIT_REV_ADJ" "$_SALT_REPO_URL" "$__SALT_CHECKOUT_REPONAME"; then
                     # shellcheck disable=SC2164
                     cd "${_SALT_GIT_CHECKOUT_DIR}"
                     __SHALLOW_CLONE=$BS_TRUE
-                    echoinfo  "shallow path git cloned $GIT_REV_ADJ, version $(python3 salt/version.py)"
+                    echoinfo  "shallow path (disabled shallow) git cloned $GIT_REV_ADJ, version $(python3 salt/version.py)"
                 else
                     # Shallow clone above failed(missing upstream tags???), let's resume the old behaviour.
                     echowarn "Failed to shallow clone."
@@ -3187,8 +3189,11 @@ install_ubuntu_git_deps() {
         __PACKAGES="${__PACKAGES} util-linux-extra"
     fi
 
-    # Additionally install procps pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
+    # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
-    __PACKAGES="${__PACKAGES} procps pciutils sudo"
+    __PACKAGES="${__PACKAGES} procps pciutils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __apt_get_install_noinput ${__PACKAGES} || return 1
@@ -3587,12 +3592,15 @@ install_debian_onedir_deps() {
         return 1
     fi
 
-    # Additionally install procps,  pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
+    # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
-    __PACKAGES='procps pciutils sudo'
+    __PACKAGES='procps pciutils'
 
     # YAML module is used for generating custom master/minion configs
     __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-yaml"
 
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
+
     # shellcheck disable=SC2086
     __apt_get_install_noinput ${__PACKAGES} || return 1
 
@@ -3635,8 +3643,11 @@ install_debian_git_deps() {
     __PACKAGES="python${PY_PKG_VER}-dev python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
     echodebug "install_debian_git_deps() Installing ${__PACKAGES}"
 
-    # Additionally install procps,  pciutils and sudo which allows for Docker bootstraps. See 366#issuecomment-39666813
+    # Additionally install procps and pciutils which allows for Docker bootstraps. See 366#issuecomment-39666813
-    __PACKAGES="${__PACKAGES} procps pciutils sudo"
+    __PACKAGES="${__PACKAGES} procps pciutils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __apt_get_install_noinput ${__PACKAGES} || return 1
@@ -3936,11 +3947,14 @@ install_fedora_deps() {
     __PACKAGES="${__PACKAGES} dnf-utils libyaml procps-ng python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"
     __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests python${PY_PKG_VER}-zmq"
     __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pip python${PY_PKG_VER}-m2crypto python${PY_PKG_VER}-pyyaml"
-    __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd sudo"
+    __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-systemd"
     if [ "${_EXTRA_PACKAGES}" != "" ]; then
         echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
     fi
 
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
+
     # shellcheck disable=SC2086
     __dnf_install_noinput ${__PACKAGES} ${_EXTRA_PACKAGES} || return 1
 
@@ -3971,7 +3985,10 @@ install_fedora_git_deps() {
     # shellcheck disable=SC2119
     __git_clone_and_checkout || return 1
 
-    __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc gcc-c++ sudo"
+    __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc gcc-c++"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __dnf_install_noinput ${__PACKAGES} || return 1
@@ -4100,7 +4117,10 @@ install_fedora_onedir_deps() {
         __install_saltstack_fedora_onedir_repository || return 1
     fi
 
-    __PACKAGES="dnf-utils chkconfig procps-ng sudo"
+    __PACKAGES="dnf-utils chkconfig procps-ng"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -4204,8 +4224,8 @@ __install_saltstack_rhel_onedir_repository() {
                 REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
                 if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
                     # Enable the Salt 3007 STS repo
-                    yum config-manager --set-disable salt-repo-*
+                    dnf config-manager --set-disable salt-repo-*
-                    yum config-manager --set-enabled salt-repo-3007-sts
+                    dnf config-manager --set-enabled salt-repo-3007-sts
                 fi
             elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
                 # using minor version
@@ -4223,11 +4243,11 @@ __install_saltstack_rhel_onedir_repository() {
             fi
         else
             # Enable the Salt LATEST repo
-            yum config-manager --set-disable salt-repo-*
+            dnf config-manager --set-disable salt-repo-*
-            yum config-manager --set-enabled salt-repo-latest
+            dnf config-manager --set-enabled salt-repo-latest
         fi
-        yum clean expire-cache || return 1
+        dnf clean expire-cache || return 1
-        yum makecache || return 1
+        dnf makecache || return 1
     elif [ "$ONEDIR_REV" != "latest" ]; then
         echowarn "salt.repo already exists, ignoring salt version argument."
         echowarn "Use -F (forced overwrite) to install $ONEDIR_REV."
@@ -4260,7 +4280,10 @@ install_centos_stable_deps() {
         __install_saltstack_rhel_onedir_repository || return 1
     fi
 
-    __PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
+    __PACKAGES="yum-utils chkconfig procps-ng findutils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -4306,6 +4329,9 @@ install_centos_stable() {
         __PACKAGES="${__PACKAGES} salt-api$MINOR_VER_STRG"
     fi
 
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
+
     # shellcheck disable=SC2086
     yum makecache || return 1
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -4384,7 +4410,10 @@ install_centos_git_deps() {
         return 1
     fi
 
-    __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc sudo"
+    __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -4480,7 +4509,10 @@ install_centos_onedir_deps() {
         __install_saltstack_rhel_onedir_repository || return 1
     fi
 
-    __PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
+    __PACKAGES="yum-utils chkconfig procps-ng findutils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -4527,8 +4559,8 @@ install_centos_onedir() {
     fi
 
     # shellcheck disable=SC2086
-    yum makecache || return 1
+    dnf makecache || return 1
-    yum list salt-minion || return 1
+    dnf list salt-minion || return 1
     __yum_install_noinput ${__PACKAGES} || return 1
 
     return 0
@@ -5581,7 +5613,10 @@ install_amazon_linux_ami_2_git_deps() {
     # shellcheck disable=SC2119
     __git_clone_and_checkout || return 1
 
-    __PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc sudo"
+    __PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -5603,7 +5638,10 @@ install_amazon_linux_ami_2_deps() {
 
     # We need to install yum-utils before doing anything else when installing on
     # Amazon Linux ECS-optimized images. See issue #974.
-    __PACKAGES="yum-utils sudo"
+    __PACKAGES="yum-utils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     __yum_install_noinput ${__PACKAGES}
 
@@ -5614,10 +5652,8 @@ install_amazon_linux_ami_2_deps() {
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
         if [ ! -s "${YUM_REPO_FILE}" ]; then
-            ## Amazon Linux yum (v3) doesn't support config-manager
+            FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
-            ## FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
+            __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            ## __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            # shellcheck disable=SC2129
             if [ "$STABLE_REV" != "latest" ]; then
                 # 3006.x is default, and latest for 3006.x branch
                 if [ "$(echo "$STABLE_REV" | grep -E '^(3006|3007)$')" != "" ]; then
@@ -5625,33 +5661,14 @@ install_amazon_linux_ami_2_deps() {
                     REPO_REV_MAJOR=$(echo "$STABLE_REV" | cut -d '.' -f 1)
                     if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
                         # Enable the Salt 3007 STS repo
-                        echo "[salt-repo-3007-sts]" > "${YUM_REPO_FILE}"
+                        dnf config-manager --set-disable salt-repo-*
-                        echo "name=Salt Repo for Salt v3007 STS" >> "${YUM_REPO_FILE}"
+                        dnf config-manager --set-enabled salt-repo-3007-sts
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3006* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
-                    else
-                        # Salt 3006 repo
-                        echo "[salt-repo-3006-lts]" > "${YUM_REPO_FILE}"
-                        echo "name=Salt Repo for Salt v3006 LTS" >> "${YUM_REPO_FILE}"
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3007* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
                     fi
                 elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
                     # using minor version
                     STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./')
                     echo "[salt-repo-${STABLE_REV_DOT}-lts]" > "${YUM_REPO_FILE}"
+                    # shellcheck disable=SC2129
                     echo "name=Salt Repo for Salt v${STABLE_REV_DOT} LTS" >> "${YUM_REPO_FILE}"
                     echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
                     echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
@@ -5663,18 +5680,11 @@ install_amazon_linux_ami_2_deps() {
                 fi
             else
                 # Enable the Salt LATEST repo
-                echo "[salt-repo-latest]" > "${YUM_REPO_FILE}"
+                dnf config-manager --set-disable salt-repo-*
-                echo "name=Salt Repo for Salt LATEST release" >> "${YUM_REPO_FILE}"
+                dnf config-manager --set-enabled salt-repo-latest
-                echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                echo "priority=10" >> "${YUM_REPO_FILE}"
-                echo "enabled=1" >> "${YUM_REPO_FILE}"
-                echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
             fi
-            yum clean expire-cache || return 1
+            dnf clean expire-cache || return 1
-            yum makecache || return 1
+            dnf makecache || return 1
         fi
     fi
 
@@ -5693,7 +5703,10 @@ install_amazon_linux_ami_2_onedir_deps() {
 
     # We need to install yum-utils before doing anything else when installing on
     # Amazon Linux ECS-optimized images. See issue #974.
-    __PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
+    __PACKAGES="yum-utils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     __yum_install_noinput ${__PACKAGES}
 
@@ -5704,10 +5717,8 @@ install_amazon_linux_ami_2_onedir_deps() {
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
         if [ ! -s "${YUM_REPO_FILE}" ]; then
-            ## Amazon Linux yum (v3) doesn't support config-manager
+            FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
-            ## FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
+            __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            ## __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            # shellcheck disable=SC2129
             if [ "$ONEDIR_REV" != "latest" ]; then
                 # 3006.x is default, and latest for 3006.x branch
                 if [ "$(echo "$ONEDIR_REV" | grep -E '^(3006|3007)$')" != "" ]; then
@@ -5715,33 +5726,14 @@ install_amazon_linux_ami_2_onedir_deps() {
                     REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
                     if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
                         # Enable the Salt 3007 STS repo
-                        echo "[salt-repo-3007-sts]" > "${YUM_REPO_FILE}"
+                        dnf config-manager --set-disable salt-repo-*
-                        echo "name=Salt Repo for Salt v3007 STS" >> "${YUM_REPO_FILE}"
+                        dnf config-manager --set-enabled salt-repo-3007-sts
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3006* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
-                    else
-                        # Salt 3006 repo
-                        echo "[salt-repo-3006-lts]" > "${YUM_REPO_FILE}"
-                        echo "name=Salt Repo for Salt v3006 LTS" >> "${YUM_REPO_FILE}"
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3007* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
                     fi
                 elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
                     # using minor version
                     ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./')
                     echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}"
+                    # shellcheck disable=SC2129
                     echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}"
                     echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
                     echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
@@ -5753,18 +5745,11 @@ install_amazon_linux_ami_2_onedir_deps() {
                 fi
             else
                 # Enable the Salt LATEST repo
-                echo "[salt-repo-latest]" > "${YUM_REPO_FILE}"
+                dnf config-manager --set-disable salt-repo-*
-                echo "name=Salt Repo for Salt LATEST release" >> "${YUM_REPO_FILE}"
+                dnf config-manager --set-enabled salt-repo-latest
-                echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                echo "priority=10" >> "${YUM_REPO_FILE}"
-                echo "enabled=1" >> "${YUM_REPO_FILE}"
-                echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
             fi
-            yum clean expire-cache || return 1
+            dnf clean expire-cache || return 1
-            yum makecache || return 1
+            dnf makecache || return 1
         fi
     fi
 
@@ -5850,7 +5835,10 @@ install_amazon_linux_ami_2023_git_deps() {
     # shellcheck disable=SC2119
     __git_clone_and_checkout || return 1
 
-    __PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc sudo"
+    __PACKAGES="python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools python${PY_PKG_VER}-devel gcc"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     # shellcheck disable=SC2086
     __yum_install_noinput ${__PACKAGES} || return 1
@@ -5864,18 +5852,14 @@ install_amazon_linux_ami_2023_git_deps() {
     return 0
 }
 
-install_amazon_linux_ami_2023_deps() {
-
-    # Set ONEDIR_REV to STABLE_REV
-    ONEDIR_REV=${STABLE_REV}
-    install_amazon_linux_ami_2023_onedir_deps || return 1
-}
-
 install_amazon_linux_ami_2023_onedir_deps() {
 
     # We need to install yum-utils before doing anything else when installing on
     # Amazon Linux ECS-optimized images. See issue #974.
-    __PACKAGES="yum-utils chkconfig procps-ng findutils sudo"
+    __PACKAGES="yum-utils"
+
+    # ensure sudo installed
+    __PACKAGES="${__PACKAGES} sudo"
 
     __yum_install_noinput ${__PACKAGES}
 
@@ -5886,10 +5870,8 @@ install_amazon_linux_ami_2023_onedir_deps() {
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
         if [ ! -s "${YUM_REPO_FILE}" ]; then
-            ## Amazon Linux yum (v3) doesn't support config-manager
+            FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
-            ## FETCH_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
+            __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            ## __fetch_url "${YUM_REPO_FILE}" "${FETCH_URL}"
-            # shellcheck disable=SC2129
             if [ "$ONEDIR_REV" != "latest" ]; then
                 # 3006.x is default, and latest for 3006.x branch
                 if [ "$(echo "$ONEDIR_REV" | grep -E '^(3006|3007)$')" != "" ]; then
@@ -5897,33 +5879,14 @@ install_amazon_linux_ami_2023_onedir_deps() {
                     REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
                     if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
                         # Enable the Salt 3007 STS repo
-                        echo "[salt-repo-3007-sts]" > "${YUM_REPO_FILE}"
+                        dnf config-manager --set-disable salt-repo-*
-                        echo "name=Salt Repo for Salt v3007 STS" >> "${YUM_REPO_FILE}"
+                        dnf config-manager --set-enabled salt-repo-3007-sts
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3006* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
-                    else
-                        # Salt 3006 repo
-                        echo "[salt-repo-3006-lts]" > "${YUM_REPO_FILE}"
-                        echo "name=Salt Repo for Salt v3006 LTS" >> "${YUM_REPO_FILE}"
-                        echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                        echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                        echo "priority=10" >> "${YUM_REPO_FILE}"
-                        echo "enabled=1" >> "${YUM_REPO_FILE}"
-                        echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                        echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                        echo "exclude=*3007* *3008* *3009* *3010*" >> "${YUM_REPO_FILE}"
-                        echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
                     fi
                 elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
                     # using minor version
                     ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./')
                     echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}"
+                    # shellcheck disable=SC2129
                     echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}"
                     echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
                     echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
@@ -5935,18 +5898,11 @@ install_amazon_linux_ami_2023_onedir_deps() {
                 fi
             else
                 # Enable the Salt LATEST repo
-                echo "[salt-repo-latest]" > "${YUM_REPO_FILE}"
+                dnf config-manager --set-disable salt-repo-*
-                echo "name=Salt Repo for Salt LATEST release" >> "${YUM_REPO_FILE}"
+                dnf config-manager --set-enabled salt-repo-latest
-                echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}"
-                echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}"
-                echo "priority=10" >> "${YUM_REPO_FILE}"
-                echo "enabled=1" >> "${YUM_REPO_FILE}"
-                echo "enabled_metadata=1" >> "${YUM_REPO_FILE}"
-                echo "gpgcheck=1" >> "${YUM_REPO_FILE}"
-                echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${YUM_REPO_FILE}"
             fi
-            yum clean expire-cache || return 1
+            dnf clean expire-cache || return 1
-            yum makecache || return 1
+            dnf makecache || return 1
         fi
     fi
 

bootstrap-salt.sh.sha256

@@ -0,0 +1 @@
+0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0

requirements/release.txt

@@ -4,31 +4,27 @@
 #
 #    pip-compile requirements/release.in
 #
-annotated-types==0.7.0
+attrs==23.1.0
-    # via pydantic
-attrs==24.3.0
     # via python-tools-scripts
-boto3==1.35.98
+boto3==1.28.79
     # via -r requirements/release.in
-botocore==1.35.98
+botocore==1.31.79
     # via
     #   boto3
     #   s3transfer
-certifi==2024.12.14
+certifi==2023.7.22
     # via requests
 cfgv==3.4.0
     # via pre-commit
-charset-normalizer==3.4.1
+charset-normalizer==3.3.2
     # via requests
-distlib==0.3.9
+distlib==0.3.7
     # via virtualenv
-filelock==3.16.1
+filelock==3.13.1
-    # via
+    # via virtualenv
-    #   python-tools-scripts
+identify==2.5.31
-    #   virtualenv
-identify==2.6.5
     # via pre-commit
-idna==3.10
+idna==3.4
     # via requests
 jmespath==1.0.1
     # via
@@ -38,41 +34,36 @@ markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-nodeenv==1.9.1
+nodeenv==1.8.0
     # via pre-commit
-platformdirs==4.3.6
+platformdirs==3.11.0
     # via virtualenv
-pre-commit==4.0.1
+pre-commit==3.5.0
     # via -r requirements/release.in
-pydantic==2.10.5
+pygments==2.16.1
-    # via python-tools-scripts
-pydantic-core==2.27.2
-    # via pydantic
-pygments==2.19.1
     # via rich
-python-dateutil==2.9.0.post0
+python-dateutil==2.8.2
     # via botocore
-python-tools-scripts==0.20.5
+python-tools-scripts==0.18.6
     # via -r requirements/release.in
-pyyaml==6.0.2
+pyyaml==6.0.1
     # via pre-commit
-requests==2.32.3
+requests==2.31.0
     # via python-tools-scripts
-rich==13.9.4
+rich==13.6.0
     # via python-tools-scripts
-s3transfer==0.10.4
+s3transfer==0.7.0
     # via boto3
-six==1.17.0
+six==1.16.0
     # via python-dateutil
-typing-extensions==4.12.2
+typing-extensions==4.8.0
-    # via
+    # via python-tools-scripts
-    #   pydantic
+urllib3==2.0.7
-    #   pydantic-core
-    #   python-tools-scripts
-    #   rich
-urllib3==2.3.0
     # via
     #   botocore
     #   requests
-virtualenv==20.28.1
+virtualenv==20.24.6
     # via pre-commit
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

tests/integration/test_installation.py

@@ -35,21 +35,10 @@ def run_salt_call(cmd):
             log.error(f"failed to produce output result, '{result}'")
 
     else:
-        if platform.system() == "Darwin":
+        cmdl = ["sudo"]
-            cmdl = ["sudo"]
-        else:
-            cmdl = []
         cmdl.extend(cmd)
         cmdl.append("--out=json")
-        try:
+        result = subprocess.run(cmdl, capture_output=True, text=True)
-            result = subprocess.run(cmdl, capture_output=True, text=True)
-        except TypeError:
-            result = subprocess.run(
-                cmdl,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                universal_newlines=True,
-            )
         if 0 == result.returncode:
             json_data = json.loads(result.stdout)
         else: