frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Document how -configdir affects the xorg.conf.d search path 

Explain the "safe" path dance for -configdir, too.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dan Nicholson 2010-04-03 09:33:48 -07:00 committed by Peter Hutterer
parent 2460e921d1
commit 2ac33888a9
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -102,10 +102,12 @@ is the machine's hostname as reported by
.BR gethostname (__libmansuffix__). .BR gethostname (__libmansuffix__).
.PP .PP
Additional configuration files are searched for in the following Additional configuration files are searched for in the following
directories: directories when the server is started as a normal user:
.PP .PP
.RS 4 .RS 4
.nf .nf
.IR /etc/X11/ <cmdline>
.IR __projectroot__/etc/X11/ <cmdline>
.I /etc/X11/__xconfigdir__\-4 .I /etc/X11/__xconfigdir__\-4
.I /etc/X11/__xconfigdir__ .I /etc/X11/__xconfigdir__
.I /etc/__xconfigdir__ .I /etc/__xconfigdir__
@ -118,6 +120,38 @@ directories:
.fi .fi
.RE .RE
.PP .PP
where
.I <cmdline>
is a relative path (with no \(lq..\(rq components) specified with the
.B \-configdir
command line option.
.PP
When the __xservername__ server is started by the \(lqroot\(rq user, the
config directory search locations are as follows:
.PP
.RS 4
.nf
<cmdline>
.IR /etc/X11/ <cmdline>
.IR __projectroot__/etc/X11/ <cmdline>
.I /etc/X11/__xconfigdir__\-4
.I /etc/X11/__xconfigdir__
.I /etc/__xconfigdir__
.IR __projectroot__/etc/X11/__xconfigdir__. <hostname>
.I __projectroot__/etc/X11/__xconfigdir__\-4
.I __projectroot__/etc/X11/__xconfigdir__
.IR __projectroot__/lib/X11/__xconfigdir__. <hostname>
.I __projectroot__/lib/X11/__xconfigdir__\-4
.I __projectroot__/lib/X11/__xconfigdir__
.fi
.RE
.PP
where
.I <cmdline>
is the path specified with the
.B \-configdir
command line option (which may be absolute or relative).
.PP
The The
.I __xconfigfile__ .I __xconfigfile__
and and