From e458a9c4759db04e3927bb926cafc8b1fa3eadc9 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Mon, 5 Dec 2022 12:48:23 -0800
Subject: [PATCH] Do not change the systemd files for Fedora 36+

---
 bootstrap-salt.sh | 6 +++---
 kitchen.yml       | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 90444b1..9248803 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4315,9 +4315,9 @@ install_fedora_git_post() {
         __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
         # Salt executables are located under `/usr/local/bin/` on Fedora 36+
-        if [ "${DISTRO_VERSION}" -ge 36 ]; then
-          sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
-        fi
+        #if [ "${DISTRO_VERSION}" -ge 36 ]; then
+        #  sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
+        #fi
 
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
diff --git a/kitchen.yml b/kitchen.yml
index acff15f..e4f422c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -72,6 +72,7 @@ platforms:
       provision_command:
         - rc-update add sshd default
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+        - touch /etc/sudoers.d/root
   - name: gentoo-systemd
     driver:
       image: gentoo/stage3:systemd
@@ -79,6 +80,7 @@ platforms:
       provision_command:
         - systemctl enable sshd.service
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+        - touch /etc/sudoers.d/root
   - name: opensuse-15
     driver:
       image: opensuse/leap:15.4