diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-03 09:33:48 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-08 15:21:01 +1000 |
| commit | 2ac33888a9a5766aaf88bc92a8bd1d489873524c (patch) | |
| tree | 1d77a1b8d41f310386377ab42ba50878fc9adc10 | |
| parent | 2460e921d18fd264e6f6374be0908f4100442650 (diff) | |
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>
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 36 |
1 files changed, 35 insertions, 1 deletions
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/ <cmdline> +.IR __projectroot__/etc/X11/ <cmdline> .I /etc/X11/__xconfigdir__\-4 .I /etc/X11/__xconfigdir__ .I /etc/__xconfigdir__ @@ -118,6 +120,38 @@ directories: .fi .RE .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 .I __xconfigfile__ and |