Browse Source

document /etc/qubes/rpc-config

QubesOS/qubes-issues#2974
Marek Marczykowski-Górecki 6 years ago
parent
commit
5ecd51dab7
4 changed files with 19 additions and 0 deletions
  1. 3 0
      Makefile
  2. 1 0
      debian/qubes-core-agent-qrexec.install
  3. 13 0
      qubes-rpc/rpc-config.README
  4. 2 0
      rpm_spec/core-agent.spec

+ 3 - 0
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

+ 1 - 0
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

+ 13 - 0
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.
+

+ 2 - 0
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