From 707d4cad8b8f3e27cb920660eb5253ba89cf451a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 9 May 2020 05:13:14 +0200 Subject: [PATCH] qubes.ShowInTerminal needs a graphical session running This specifically fixes qvm-console-dispvm tool, which uses qubes.ShowInTerminal to show the actual console. This service uses xterm, so it needs X session running already. Fixes QubesOS/qubes-issues#5805 --- debian/qubes-core-agent.install | 1 + qubes-rpc/qubes.ShowInTerminal.config | 1 + rpm_spec/core-agent.spec.in | 1 + 3 files changed, 3 insertions(+) create mode 100644 qubes-rpc/qubes.ShowInTerminal.config diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 580a532..fa4f033 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -44,6 +44,7 @@ etc/qubes/rpc-config/qubes.OpenInVM etc/qubes/rpc-config/qubes.OpenURL etc/qubes/rpc-config/qubes.SelectFile etc/qubes/rpc-config/qubes.SelectDirectory +etc/qubes/rpc-config/qubes.ShowInTerminal etc/qubes/rpc-config/qubes.StartApp etc/qubes/rpc-config/qubes.InstallUpdatesGUI etc/qubes/rpc-config/qubes.VMShell+WaitForSession diff --git a/qubes-rpc/qubes.ShowInTerminal.config b/qubes-rpc/qubes.ShowInTerminal.config new file mode 100644 index 0000000..094e56c --- /dev/null +++ b/qubes-rpc/qubes.ShowInTerminal.config @@ -0,0 +1 @@ +wait-for-session=1 diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 679d836..32fd8ea 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -602,6 +602,7 @@ rm -f %{name}-%{version} %config(noreplace) /etc/qubes/rpc-config/qubes.OpenURL %config(noreplace) /etc/qubes/rpc-config/qubes.SelectFile %config(noreplace) /etc/qubes/rpc-config/qubes.SelectDirectory +%config(noreplace) /etc/qubes/rpc-config/qubes.ShowInTerminal %config(noreplace) /etc/qubes/rpc-config/qubes.StartApp %config(noreplace) /etc/qubes/rpc-config/qubes.InstallUpdatesGUI %config(noreplace) /etc/qubes/rpc-config/qubes.VMShell+WaitForSession