Skip to content

Commit 340679d

Browse files
committed
Use rpc config to run qubes.USB as root
Instead of sudo. It makes it work out of the box on a minimal template. And also will work if sudo is not installed. QubesOS/qubes-issues#9599
1 parent 37b2feb commit 340679d

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ install-vm:
33
install qubes-rpc/qubes.USBAttach $(DESTDIR)/etc/qubes-rpc
44
install qubes-rpc/qubes.USBDetach $(DESTDIR)/etc/qubes-rpc
55
install qubes-rpc/qubes.USB $(DESTDIR)/etc/qubes-rpc
6+
install -d $(DESTDIR)/etc/qubes/rpc-config
7+
install -T -m 0644 qubes-rpc/qubes.USB.config \
8+
$(DESTDIR)/etc/qubes/rpc-config/qubes.USB
69
install -d $(DESTDIR)/usr/lib/qubes
710
install src/usb-* $(DESTDIR)/usr/lib/qubes
811
install -d $(DESTDIR)/usr/lib/udev/rules.d

qubes-rpc/qubes.USB.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
force-user='root'

rpm_spec/qubes-usb-proxy.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ make install-vm DESTDIR=${RPM_BUILD_ROOT}
3131
/etc/qubes-rpc/qubes.USB
3232
/etc/qubes-rpc/qubes.USBAttach
3333
/etc/qubes-rpc/qubes.USBDetach
34+
/etc/qubes/rpc-config/qubes.USB
3435
/etc/qubes/suspend-pre.d/usb-detach-all.sh
3536
/usr/lib/qubes/usb-import
3637
/usr/lib/qubes/usb-export

0 commit comments

Comments
 (0)