fix: wrong template name for sys-gui associates

For: #89
ben-grande · Jan 8, 2025 · 31a606e · 31a606e
1 parent b182a44
commit 31a606e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/salt/sys-gui-gpu/README.md b/salt/sys-gui-gpu/README.md
@@ -22,7 +22,7 @@ WARNING: [unfinished formula](../../docs/TROUBLESHOOT.md#no-support-for-unfinish
 *   Top:
 
 ```sh
-sudo qubesctl top.enable qvm.sys-gui pillar=True
+sudo qubesctl top.enable qvm.sys-gui-gpu pillar=True
 sudo qubesctl top.enable sys-gui-gpu
 sudo qubesctl --targets=tpl-sys-gui,sys-gui-gpu state.apply
 sudo qubesctl top.disable sys-gui-gpu
@@ -34,7 +34,7 @@ sudo qubesctl state.apply sys-gui-gpu.prefs
 <!-- pkg:begin:post-install -->
 
 ```sh
-sudo qubesctl top.enable qvm.sys-gui pillar=True
+sudo qubesctl top.enable qvm.sys-gui-gpu pillar=True
 sudo qubesctl state.apply sys-gui-gpu.create
 sudo qubesctl --skip-dom0 --targets=tpl-sys-gui state.apply sys-gui-gpu.install
 sudo qubesctl --skip-dom0 --targets=sys-gui-gpu state.apply sys-gui-gpu.configure

diff --git a/salt/sys-gui-gpu/create.sls b/salt/sys-gui-gpu/create.sls
@@ -2,7 +2,7 @@
 SPDX-FileCopyrightText: 2020 Artur Puzio <[email protected]>
 SPDX-FileCopyrightText: 2020 Frederic Pierret <frederic.pierret@qubes-os.org>
 SPDX-FileCopyrightText: 2020 - 2024 Marmarek Marczykowski-Gorecki <[email protected]>
-SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <[email protected]>
 
 SPDX-License-Identifier: GPL-2.0-only
 #}
@@ -25,25 +25,15 @@ include:
       {% endif %}
 
 {% load_yaml as defaults -%}
-name: tpl-{{ slsdotpath }}
+name: {{ slsdotpath }}
 force: True
 require:
-- sls: {{ slsdotpath }}.clone
-prefs:
-- audiovm: ""
-{%- endload %}
-{{ load(defaults) }}
-
-{% load_yaml as defaults -%}
-name: {{ slsdotpath }}-gpu
-force: True
-require:
-- sls: {{ slsdotpath }}.clone
+- qvm: tpl-sys-gui
 present:
-- template: tpl-{{ slsdotpath }}
+- template: tpl-sys-gui
 - label: black
 prefs:
-- template: tpl-{{ slsdotpath }}
+- template: tpl-sys-gui
 - label: black
 - memory: 600
 - maxmem: 4000

diff --git a/salt/sys-gui-vnc/README.md b/salt/sys-gui-vnc/README.md
@@ -22,7 +22,7 @@ WARNING: [unfinished formula](../../docs/TROUBLESHOOT.md#no-support-for-unfinish
 *   Top:
 
 ```sh
-sudo qubesctl top.enable qvm.sys-gui pillar=True
+sudo qubesctl top.enable qvm.sys-gui-vnc pillar=True
 sudo qubesctl top.enable sys-gui-vnc
 sudo qubesctl --targets=tpl-sys-gui,sys-gui-vnc state.apply
 sudo qubesctl top.disable sys-gui-vnc
@@ -34,7 +34,7 @@ sudo qubesctl state.apply sys-gui-vnc.prefs
 <!-- pkg:begin:post-install -->
 
 ```sh
-sudo qubesctl top.enable qvm.sys-gui pillar=True
+sudo qubesctl top.enable qvm.sys-gui-vnc pillar=True
 sudo qubesctl state.apply sys-gui-vnc.create
 sudo qubesctl --skip-dom0 --targets=tpl-sys-gui state.apply sys-gui-vnc.install
 sudo qubesctl --skip-dom0 --targets=sys-gui-vnc state.apply sys-gui-vnc.configure

diff --git a/salt/sys-gui-vnc/create.sls b/salt/sys-gui-vnc/create.sls
@@ -1,7 +1,7 @@
 {#
 SPDX-FileCopyrightText: 2021 Frederic Pierret <frederic.pierret@qubes-os.org>
 SPDX-FileCopyrightText: 2021 - 2024 Marmarek Marczykowski-Gorecki <[email protected]>
-SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <[email protected]>
 
 SPDX-License-Identifier: GPL-2.0-only
 #}
@@ -28,25 +28,15 @@ include:
 {% endif %}
 
 {% load_yaml as defaults -%}
-name: tpl-{{ slsdotpath }}
+name: {{ slsdotpath }}
 force: True
 require:
-- sls: {{ slsdotpath }}.clone
-prefs:
-- audiovm: ""
-{%- endload %}
-{{ load(defaults) }}
-
-{% load_yaml as defaults -%}
-name: {{ slsdotpath }}-vnc
-force: True
-require:
-- sls: {{ slsdotpath }}.clone
+- qvm: tpl-sys-gui
 present:
-- template: tpl-{{ slsdotpath }}
+- template: tpl-sys-gui
 - label: black
 prefs:
-- template: tpl-{{ slsdotpath }}
+- template: tpl-sys-gui
 - label: black
 - memory: 400
 - maxmem: 4000