summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-04-04 15:29:42 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-01 11:36:30 +1000
commit88bacc49f06da5927f716869f5a32672a8297ed0 (patch)
tree322009183b8774de9b15a5cbd3cf4c04a4d972c6 /man
parent1d82ec95942b88dd01f0ac6b883368360a0b5fe6 (diff)
os: Add -displayfd option
This option specifies a file descriptor in the launching process. X will scan for an available display number and write that number back to the launching process, at the same time as SIGUSR1 generation. This means display managers don't need to guess at available display numbers. As a consequence, if X fails to start when using -displayfd, it's not because the display was in use, so there's no point in retrying the X launch on a higher display number. Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Tested-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'man')
-rw-r--r--man/Xserver.man7
1 files changed, 7 insertions, 0 deletions
diff --git a/man/Xserver.man b/man/Xserver.man
index 0cd9b941c..8d243d6b7 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -127,6 +127,13 @@ Not obeyed by all servers.
.B \-core
causes the server to generate a core dump on fatal errors.
.TP 8
+.B \-displayfd \fIfd\fP
+specifies a file descriptor in the launching process. Rather than specify
+a display number, the X server will attempt to listen on successively higher
+display numbers, and upon finding a free one, will write the port number back
+on this file descriptor as a newline-terminated string. The \-pn option is
+ignored when using \-displayfd.
+.TP 8
.B \-deferglyphs \fIwhichfonts\fP
specifies the types of fonts for which the server should attempt to use
deferred glyph loading. \fIwhichfonts\fP can be all (all fonts),