diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-12-21 00:04:16 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-12-22 23:20:45 -0800 |
| commit | efa5269f23c2237eb5368bf5245ffbbf35714153 (patch) | |
| tree | fc0d6e114c93b0f13148b81c20b9e7614e8320c6 /include | |
| parent | f1e869aca176e9113f9d234b0ea59b4cac295cc4 (diff) | |
xfree86: Use xorg.conf.d directory for multiple config files
Currently there is a single file, xorg.conf, for configuring the server.
This works fine most of the time, but it becomes a problem when packages
or system services need to adjust the configuration. Instead, allow
multiple configuration files to live in a directory. Typically this will
be /etc/X11/xorg.conf.d.
Files with a suffix of .conf will be read and added to the server
configuration after xorg.conf. The server won't fall back to using the
auto configuration unless there is no config file and there are no files
in the config directory.
Right now this uses a simpler search template than the config file
search path by not using the command line or environment variable
parameters. The matching code was refactored a bit to make this more
coherent. Any DDX wanting to read the config files will need to call
xf86initConfigFiles before opening/reading them. This is to allow
xf86openConfigFile without xf86openConfigDirFiles and vice-versa.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xorg-config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 9fe7cdef5..8946a6538 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -36,6 +36,9 @@ /* Path to configuration file. */ #undef __XCONFIGFILE__ +/* Name of configuration directory. */ +#undef __XCONFIGDIR__ + /* Path to loadable modules. */ #undef DEFAULT_MODULE_PATH |