Skip to content

Commit ee3c857

Browse files
committed
Use new built-in TCP support in qrexec for qubes.ConnectTCP
Enable exit-on-stdout-eof feature, since that is what socat did. QubesOS/qubes-issues#9037
1 parent a8375d8 commit ee3c857

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

debian/qubes-core-agent.install

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ etc/qubes/autostart/*
4343
etc/qubes/applications/*
4444
etc/qubes/post-install.d/README
4545
etc/qubes/post-install.d/*.sh
46+
etc/qubes/rpc-config/qubes.ConnectTCP
4647
etc/qubes/rpc-config/qubes.OpenInVM
4748
etc/qubes/rpc-config/qubes.OpenURL
4849
etc/qubes/rpc-config/qubes.SelectFile

qubes-rpc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ install:
7676
qubes.PostInstall \
7777
qubes.GetDate \
7878
qubes.ShowInTerminal \
79-
qubes.ConnectTCP \
8079
qubes.TemplateSearch \
8180
qubes.TemplateDownload
8281
$(LN) qubes.VMExec $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.VMExecGUI
82+
$(LN) /dev/tcp/127.0.0.1 $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.ConnectTCP
8383
for config in *.config; do \
8484
install -D -m 0644 "$$config" "$(DESTDIR)$(QUBESRPCCONFDIR)/$${config%.config}"; \
8585
done

qubes-rpc/qubes.ConnectTCP

-10
This file was deleted.

qubes-rpc/qubes.ConnectTCP.config

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
skip-service-descriptor=true
2+
exit-on-stdout-eof=true

rpm_spec/core-agent.spec.in

+1
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,7 @@ rm -f %{name}-%{version}
909909
%config(noreplace) /etc/qubes-rpc/qubes.StartApp
910910
%config(noreplace) /etc/qubes-rpc/qubes.PostInstall
911911
%config(noreplace) /etc/qubes-rpc/qubes.GetDate
912+
%config(noreplace) /etc/qubes/rpc-config/qubes.ConnectTCP
912913
%config(noreplace) /etc/qubes/rpc-config/qubes.OpenInVM
913914
%config(noreplace) /etc/qubes/rpc-config/qubes.OpenURL
914915
%config(noreplace) /etc/qubes/rpc-config/qubes.SelectFile

0 commit comments

Comments
 (0)