Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-01-30 09:03:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong template name for sys-gui associates

Browse Source 
For: https://github.com/ben-grande/qusal/issues/89
This commit is contained in:
Ben Grande 2025-01-08 16:39:15 +01:00
parent b182a44bb1
commit 31a606e752
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
4 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/sys-gui-gpu/README.md
View File

@ -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

20
salt/sys-gui-gpu/create.sls
View File

@ -2,7 +2,7 @@
SPDX-FileCopyrightText: 2020 Artur Puzio <contact@puzio.waw.pl>
SPDX-FileCopyrightText: 2020 Frederic Pierret <frederic.pierret@qubes-os.org>
SPDX-FileCopyrightText: 2020 - 2024 Marmarek Marczykowski-Gorecki <marmarek@invisiblethingslab.com>
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
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

4
salt/sys-gui-vnc/README.md
View File

@ -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

20
salt/sys-gui-vnc/create.sls
View File

@ -1,7 +1,7 @@
{#
SPDX-FileCopyrightText: 2021 Frederic Pierret <frederic.pierret@qubes-os.org>
SPDX-FileCopyrightText: 2021 - 2024 Marmarek Marczykowski-Gorecki <marmarek@invisiblethingslab.com>
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
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