Skip to content

Don't use sudo to make it compatible with minimal template #49

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
merged 2 commits into from
Aug 6, 2025
Merged

Don't use sudo to make it compatible with minimal template #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37b2feb
Remove old-format policy file
marmarek Jul 27, 2025
340679d
Use rpc config to run qubes.USB as root
marmarek Jul 27, 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
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ install-vm:
install qubes-rpc/qubes.USBAttach $(DESTDIR)/etc/qubes-rpc
install qubes-rpc/qubes.USBDetach $(DESTDIR)/etc/qubes-rpc
install qubes-rpc/qubes.USB $(DESTDIR)/etc/qubes-rpc
install -d $(DESTDIR)/etc/qubes/rpc-config
install -T -m 0644 qubes-rpc/qubes.USB.config \
$(DESTDIR)/etc/qubes/rpc-config/qubes.USB
install -d $(DESTDIR)/usr/lib/qubes
install src/usb-* $(DESTDIR)/usr/lib/qubes
install -d $(DESTDIR)/usr/lib/udev/rules.d
Expand All @@ -13,5 +16,4 @@ install-vm:

install-dom0:
python3 setup.py install -O1 --root $(DESTDIR)
install -D -m 0664 qubes-rpc/qubes.USB.policy $(DESTDIR)/etc/qubes-rpc/policy/qubes.USB

1 change: 1 addition & 0 deletions qubes-rpc/qubes.USB.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
force-user='root'
1 change: 0 additions & 1 deletion qubes-rpc/qubes.USB.policy
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion rpm_spec/qubes-usb-proxy-dom0.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ This package also contains tests.
make install-dom0 DESTDIR=${RPM_BUILD_ROOT}

%files
%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.USB
%dir %{python3_sitelib}/qubesusbproxy-*.egg-info
%{python3_sitelib}/qubesusbproxy-*.egg-info/*
%{python3_sitelib}/qubesusbproxy
Expand Down
1 change: 1 addition & 0 deletions rpm_spec/qubes-usb-proxy.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ make install-vm DESTDIR=${RPM_BUILD_ROOT}
/etc/qubes-rpc/qubes.USB
/etc/qubes-rpc/qubes.USBAttach
/etc/qubes-rpc/qubes.USBDetach
/etc/qubes/rpc-config/qubes.USB
/etc/qubes/suspend-pre.d/usb-detach-all.sh
/usr/lib/qubes/usb-import
/usr/lib/qubes/usb-export
Expand Down