From 3c249d4388997a32d7590d852eb660d131cda538 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sat, 6 May 2023 15:27:03 -0500
Subject: [PATCH] Fix polkit and re-enable

---
 states/polkit/init.sls | 7 +++++--
 states/top.sls         | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/states/polkit/init.sls b/states/polkit/init.sls
index ca86f2d..6df7253 100644
--- a/states/polkit/init.sls
+++ b/states/polkit/init.sls
@@ -11,6 +11,7 @@ polkit:
     - clean: True
     - require:
       - pkg: polkit
+  {% if not salt.chroot.in_chroot() %}
   service.running:
     - name: polkit
     - enable: True
@@ -18,8 +19,10 @@ polkit:
       - pkg: polkit
     - watch:
       - file: polkit
+      - file: /etc/polkit-1/rules.d
+  {% endif %}
 
 /etc/polkit-1/rules.d:
   file.absent:
-    - watch_in:
-      - service: polkit
+    - require:
+      - pkg: polkit
diff --git a/states/top.sls b/states/top.sls
index 0865815..6b1a4bd 100644
--- a/states/top.sls
+++ b/states/top.sls
@@ -26,7 +26,7 @@ base:
     - users
 
   # Server
-  '* and not *pc*':
+  'not *pc*':
     - match: compound
     - ssh
 
@@ -38,6 +38,11 @@ base:
     - user_policies
     - signal
 
+  # Test/Dev Systems
+  'test* or dev*':
+    - match: compound
+    - ssh
+
   'irc*':
     - irssi
     - webapps