diff --git a/Makefile b/Makefile index e9a7d5c..1e04284 100644 --- a/Makefile +++ b/Makefile @@ -272,6 +272,9 @@ install-common: install-doc install -m 0755 qubes-rpc/qubes.PostInstall $(DESTDIR)/etc/qubes-rpc install -m 0755 qubes-rpc/qubes.GetDate $(DESTDIR)/etc/qubes-rpc + install -d $(DESTDIR)/etc/qubes/rpc-config + install -m 0644 qubes-rpc/rpc-config.README $(DESTDIR)/etc/qubes/rpc-config/README + install -d $(DESTDIR)/etc/qubes/suspend-pre.d install -m 0644 qubes-rpc/suspend-pre.README $(DESTDIR)/etc/qubes/suspend-pre.d/README install -d $(DESTDIR)/etc/qubes/suspend-post.d diff --git a/debian/qubes-core-agent-qrexec.install b/debian/qubes-core-agent-qrexec.install index 0696b42..f83af2e 100644 --- a/debian/qubes-core-agent-qrexec.install +++ b/debian/qubes-core-agent-qrexec.install @@ -1,4 +1,5 @@ etc/pam.d/qrexec +etc/qubes/rpc-config/README lib/systemd/system/qubes-qrexec-agent.service usr/bin/qrexec-client-vm usr/bin/qrexec-fork-server diff --git a/qubes-rpc/rpc-config.README b/qubes-rpc/rpc-config.README new file mode 100644 index 0000000..609f05f --- /dev/null +++ b/qubes-rpc/rpc-config.README @@ -0,0 +1,13 @@ +This is directory for qrexec service additional configuration. Configuration +file needs to be named exactly as service. Configuration format is 'key=value' +(without spaces around '='). Lines starting with '#' are ignored. + +Supported settings: + +* wait-for-session - wait for full GUI session initialization before starting + the service. This is done using /etc/qubes-rpc/qubes.WaitForSession script. + There is no timeout - if the session is never initialized + (for example because there is no GUI running at all), service will never be + started. + Allowed values are 0 or 1. + diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index c59d7a4..a798800 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -518,6 +518,8 @@ rm -f %{name}-%{version} %config(noreplace) /etc/qubes-rpc/qubes.StartApp %config(noreplace) /etc/qubes-rpc/qubes.PostInstall %config(noreplace) /etc/qubes-rpc/qubes.GetDate +%dir /etc/qubes/rpc-config +/etc/qubes/rpc-config/README %dir /etc/qubes/autostart %config(noreplace) /etc/default/grub.qubes /etc/qubes/autostart/README.txt