Skip to content

Prioritize sys-usb before other autostarted VMs #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 4 commits into from
Jul 19, 2025
Merged

Prioritize sys-usb before other autostarted VMs #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e102ffa
Extract sys-usb-prioritize-autostart.sls
rustybird Jul 13, 2025
784e596
Prioritize sys-usb autostart in qvm.usb-keyboard, not in qvm.sys-usb
rustybird Jul 13, 2025
4f6b014
Prioritize sys-usb before other autostarted VMs
rustybird Jul 13, 2025
e4ae100
Conditionally apply qvm.sys-usb-prioritize-autostart in %post
rustybird Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions qvm/sys-usb-prioritize-autostart.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# vim: set syntax=yaml ts=2 sw=2 sts=2 et :

##
# qvm.sys-usb-prioritize-autostart
# ================================
#
# Prioritize sys-usb startup before login and other autostarted VMs.
#
# Execute:
# qubesctl state.sls qvm.sys-usb-prioritize-autostart
##

/etc/systemd/system/qubes-vm@{{ salt['pillar.get']('qvm:sys-usb:name', 'sys-usb') }}.service.d/50_autostart.conf:
file.managed:
- contents: |
[Unit]
Before=systemd-user-sessions.service
- makedirs: True

/etc/systemd/system/[email protected]/50_autostart.conf:
file.managed:
- contents: |
[Unit]
After=qubes-vm@{{ salt['pillar.get']('qvm:sys-usb:name', 'sys-usb') }}.service
- makedirs: True
7 changes: 0 additions & 7 deletions qvm/sys-usb.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,3 @@ sys-usb-input-proxy:
qubes.InputTablet * {{ salt['pillar.get']('qvm:sys-usb:name', 'sys-usb') }} dom0 deny
- require:
- pkg: qubes-input-proxy

/etc/systemd/system/qubes-vm@{{ salt['pillar.get']('qvm:sys-usb:name', 'sys-usb') }}.service.d/50_autostart.conf:
file.managed:
- contents: |
[Unit]
Before=systemd-user-sessions.service
- makedirs: True
1 change: 1 addition & 0 deletions qvm/usb-keyboard.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

include:
- qvm.sys-usb
- qvm.sys-usb-prioritize-autostart

{% from "qvm/template.jinja" import load -%}

Expand Down
7 changes: 7 additions & 0 deletions rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ if [ -r /srv/pillar/_tops/dom0/qvm.top ]; then
rm -f /srv/pillar/_tops/dom0/qvm.top
fi

# If sys-usb was already prioritized before login,
# ensure that it is also prioritized before other autostarted VMs.
if [ -s /etc/systemd/system/[email protected]/50_autostart.conf ]; then
qubesctl state.sls qvm.sys-usb-prioritize-autostart
fi

%posttrans

if [ -e /var/run/%{name}-default-mgmt-dvm-firstinstall ]; then
Expand Down Expand Up @@ -98,6 +104,7 @@ fi
/srv/formulas/base/virtual-machines-formula/qvm/sys-firewall.top
/srv/formulas/base/virtual-machines-formula/qvm/sys-net.sls
/srv/formulas/base/virtual-machines-formula/qvm/sys-net.top
/srv/formulas/base/virtual-machines-formula/qvm/sys-usb-prioritize-autostart.sls
/srv/formulas/base/virtual-machines-formula/qvm/sys-usb.sls
/srv/formulas/base/virtual-machines-formula/qvm/sys-usb.top
/srv/formulas/base/virtual-machines-formula/qvm/sys-whonix.sls
Expand Down