Merge branch '2.4/dev' into desktop

2025-12-20 16:03:06 +01:00 · 2023-06-26 15:36:48 -04:00
parent 02e6e11be7 7ea37ac2dd
commit b6986d5c61
69 changed files with 1849 additions and 3413 deletions
--- a/salt/common/soup_scripts.sls
+++ b/salt/common/soup_scripts.sls
@@ -8,6 +8,15 @@ soup_scripts:
    - source: salt://common/tools/sbin
    - include_pat:
        - so-common
-        - so-firewall
        - so-image-common
-        - soup
+
+soup_manager_scripts:
+  file.recurse:
+    - name: /usr/sbin
+    - user: root
+    - group: root
+    - file_mode: 755
+    - source: salt://manager/tools/sbin
+    - include_pat:
+        - so-firewall
+        - soup