From 460670bef85a986c821d5207eddeaecfa398979f Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Mon, 1 May 2023 20:00:55 -0700
Subject: [PATCH] Add chahgelogs for #64141 and #64158

---
 changelog/64141.fixed.md                | 1 +
 changelog/64158.fixed.md                | 1 +
 pkg/tests/integration/test_salt_user.py | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog/64141.fixed.md
 create mode 100644 changelog/64158.fixed.md

diff --git a/changelog/64141.fixed.md b/changelog/64141.fixed.md
new file mode 100644
index 000000000000..62c3e8f90c16
--- /dev/null
+++ b/changelog/64141.fixed.md
@@ -0,0 +1 @@
+Make salt user's home /opt/saltstack/salt
diff --git a/changelog/64158.fixed.md b/changelog/64158.fixed.md
new file mode 100644
index 000000000000..a31abbfe0232
--- /dev/null
+++ b/changelog/64158.fixed.md
@@ -0,0 +1 @@
+Salt minion runs with salt group permissions
diff --git a/pkg/tests/integration/test_salt_user.py b/pkg/tests/integration/test_salt_user.py
index 374004178f3b..4c8d1af664d5 100644
--- a/pkg/tests/integration/test_salt_user.py
+++ b/pkg/tests/integration/test_salt_user.py
@@ -28,7 +28,9 @@ def test_salt_user_home(install_salt):
     """
     Test the correct user is running the Salt Master
     """
-    proc = subprocess.run(["getent", "salt"], check=False, capture_output=True)
+    proc = subprocess.run(
+        ["getent", "passwd", "salt"], check=False, capture_output=True
+    )
     assert proc.returncode == 0
     home = ""
     try:
@@ -47,7 +49,7 @@ def test_salt_user_group(install_salt):
     in_group = False
     try:
         for group in proc.stdout.decode().split(" "):
-            if group == "salt":
+            if "salt" in group:
                 in_group = True
     except:
         pass