Skip to content

Commit 068492a

Browse files
committed
Use new built-in TCP support in qrexec for qubes.UpdatesProxy
QubesOS/qubes-issues#9037
1 parent 23bec0c commit 068492a

6 files changed

+4
-4
lines changed

Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ install-netvm: install-systemd-networking-dropins install-networkmanager
229229
install -m 0400 -D network/qubes-antispoof.nft $(DESTDIR)/etc/qubes/qubes-antispoof.nft
230230
install -m 0400 -D network/qubes-ipv6-disabled.nft $(DESTDIR)/etc/qubes/qubes-ipv6-disabled.nft
231231

232-
install -m 0755 -D qubes-rpc/qubes.UpdatesProxy $(DESTDIR)/etc/qubes-rpc/qubes.UpdatesProxy
233-
234232
# networkmanager install target allow integration of NetworkManager for Qubes VM:
235233
# * make connections config persistent
236234
# * adjust DNS redirections when needed

debian/qubes-core-agent-networking.install

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
etc/dhclient.d/qubes-setup-dnat-to-ns.sh
22
etc/qubes-rpc/qubes.UpdatesProxy
3+
etc/qubes/rpc-config/qubes.UpdatesProxy
34
etc/qubes/qubes-ipv6-disabled.nft
45
etc/qubes/qubes-ipv6.nft
56
etc/qubes/qubes-ipv4.nft

qubes-rpc/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ install:
8080
qubes.TemplateDownload
8181
$(LN) qubes.VMExec $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.VMExecGUI
8282
$(LN) /dev/tcp/127.0.0.1 $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.ConnectTCP
83+
$(LN) /dev/tcp/127.0.0.1/8082 $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.UpdatesProxy
8384
for config in *.config; do \
8485
install -D -m 0644 "$$config" "$(DESTDIR)$(QUBESRPCCONFDIR)/$${config%.config}"; \
8586
done

qubes-rpc/qubes.UpdatesProxy

-2
This file was deleted.

qubes-rpc/qubes.UpdatesProxy.config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
skip-service-descriptor=true

rpm_spec/core-agent.spec.in

+1
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,7 @@ rm -f %{name}-%{version}
11001100
%config(noreplace) /etc/qubes/qubes-ipv4.nft
11011101
%config(noreplace) /etc/qubes/qubes-ipv6.nft
11021102
%config(noreplace) /etc/qubes/qubes-ipv6-disabled.nft
1103+
%config(noreplace) /etc/qubes/rpc-config/qubes.UpdatesProxy
11031104
%config(noreplace) /etc/tinyproxy/tinyproxy-updates.conf
11041105
%config(noreplace) /etc/tinyproxy/updates-blacklist
11051106
%config(noreplace) /etc/udev/rules.d/99-qubes-network.rules

0 commit comments

Comments
 (0)