From ffe03ba02a1febbb17f39a7b11543cf151289be4 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Mon, 10 Jun 2024 19:39:08 +0200
Subject: [PATCH] fix: set global prefs for management_dispvm

---
 salt/mgmt/prefs.sls | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/salt/mgmt/prefs.sls b/salt/mgmt/prefs.sls
index 5576419..ae76561 100644
--- a/salt/mgmt/prefs.sls
+++ b/salt/mgmt/prefs.sls
@@ -7,7 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
   - .create
 
-"{{ slsdotpath }}-set-management_dispvm-to-default":
+"{{ slsdotpath }}-set-qubes-prefs-management_dispvm-to-dvm-{{ slsdotpath }}":
+  cmd.run:
+    - require:
+      - cmd: "{{ slsdotpath }}-install-salt-deps"
+    - name: qubes-prefs management_dispvm dvm-{{ slsdotpath }}
+
+"{{ slsdotpath }}-set-tpl-{{ slsdotpath }}-management_dispvm-to-default":
   qvm.vm:
     - require:
       - cmd: "{{ slsdotpath }}-install-salt-deps"
@@ -18,7 +24,8 @@ include:
 "{{ slsdotpath }}-remove-default-mgmt-dvm":
   qvm.absent:
     - require:
-      - qvm: {{ slsdotpath }}-set-management_dispvm-to-default
+      - cmd: "{{ slsdotpath }}-set-qubes-prefs-management_dispvm-to-dvm-{{ slsdotpath }}"
+      - qvm: "{{ slsdotpath }}-set-tpl-{{ slsdotpath }}-management_dispvm-to-default"
     - name: default-mgmt-dvm
 
 ## TODO: Remove when template with patch reaches upstream or updates enforce
@@ -27,7 +34,7 @@ include:
 "{{ slsdotpath }}-shutdown-template":
   qvm.shutdown:
     - require:
-      - qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
+      - qvm: "{{ slsdotpath }}-set-tpl-{{ slsdotpath }}-management_dispvm-to-default"
     - name: tpl-{{ slsdotpath }}
     - flags:
       - force