Skip to content

Commit

Permalink
Allow sys-gui to manage itself
Browse files Browse the repository at this point in the history
With QubesOS/qubes-core-admin#326, the admin.vm.List endpoint only
lists the VMs allowed by policy. This confuses qvm-start-gui, because
it sees sys-gui listed as a guivm for other machines, but doesn't see
it in the output of admin.vm.List.
  • Loading branch information
pwmarcz committed Mar 26, 2020
1 parent 6e19e67 commit ade7b02
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion qvm/sys-gui.sls
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ sys-gui-rpc:
file.append:
- text: |
sys-gui @tag:guivm-sys-gui allow,target=dom0
sys-gui sys-gui allow,target=dom0
# GuiVM (AdminVM) with global 'ro' permissions
{% if salt['pillar.get']('qvm:sys-gui:admin-global-permissions') == 'ro' %}
Expand All @@ -68,6 +69,7 @@ sys-gui-rpc:
- text: |
sys-gui @adminvm allow,target=dom0
sys-gui @tag:guivm-sys-gui allow,target=dom0
sys-gui sys-gui allow,target=dom0
{% endif %}

{% if salt['pillar.get']('qvm:sys-gui:admin-global-permissions') == 'rwx' %}
Expand All @@ -77,4 +79,5 @@ sys-gui-rpc:
- text: |
sys-gui @adminvm allow,target=dom0
sys-gui @tag:guivm-sys-gui allow,target=dom0
{% endif %}
sys-gui sys-gui allow,target=dom0
{% endif %}

0 comments on commit ade7b02

Please sign in to comment.