From 2ac33888a9a5766aaf88bc92a8bd1d489873524c Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sat, 3 Apr 2010 09:33:48 -0700 Subject: [PATCH] xfree86: Document how -configdir affects the xorg.conf.d search path Explain the "safe" path dance for -configdir, too. Signed-off-by: Dan Nicholson Signed-off-by: Peter Hutterer --- hw/xfree86/doc/man/xorg.conf.man.pre | 36 +++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 93c8ac41d..9a40ce33f 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -102,10 +102,12 @@ is the machine's hostname as reported by .BR gethostname (__libmansuffix__). .PP Additional configuration files are searched for in the following -directories: +directories when the server is started as a normal user: .PP .RS 4 .nf +.IR /etc/X11/ +.IR __projectroot__/etc/X11/ .I /etc/X11/__xconfigdir__\-4 .I /etc/X11/__xconfigdir__ .I /etc/__xconfigdir__ @@ -118,6 +120,38 @@ directories: .fi .RE .PP +where +.I +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 + +.IR /etc/X11/ +.IR __projectroot__/etc/X11/ +.I /etc/X11/__xconfigdir__\-4 +.I /etc/X11/__xconfigdir__ +.I /etc/__xconfigdir__ +.IR __projectroot__/etc/X11/__xconfigdir__. +.I __projectroot__/etc/X11/__xconfigdir__\-4 +.I __projectroot__/etc/X11/__xconfigdir__ +.IR __projectroot__/lib/X11/__xconfigdir__. +.I __projectroot__/lib/X11/__xconfigdir__\-4 +.I __projectroot__/lib/X11/__xconfigdir__ +.fi +.RE +.PP +where +.I +is the path specified with the +.B \-configdir +command line option (which may be absolute or relative). +.PP The .I __xconfigfile__ and