diff options
author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-03-24 15:56:19 +0200 |
---|---|---|
committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-03-27 09:38:12 +0200 |
commit | 6c71aaeec5d034e052c9d95f3c36b5b38069f6d8 (patch) | |
tree | 6a5d8b4cebb294d03b583e891553c5fcffc26cff /man | |
parent | dc940caae54ee8a631a30d76b54b209dab322d12 (diff) |
Pass config file from compositor to everything
We have the Weston command line option '--no-config' which is meant to
prevent loading weston.ini at all. It works for Weston itself, but it
does not work for any clients that also want to read weston.ini.
To fix that, introduce a new environment variable WESTON_CONFIG_FILE.
Weston will set it to the absolute path of the config file it loads.
Clients will load the config file pointed to by WESTON_CONFIG_FILE. If
the environment variable is set but empty, no config file will be
loaded. If the variable is unset, things fall back to the default
"weston.ini".
Note, that Weston will only set WESTON_CONFIG_FILE, it never reads it.
The ability to specify a custom config file to load will be another patch.
All programs that loaded "weston.ini" are modified to honour
WESTON_CONFIG_FILE.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'man')
-rw-r--r-- | man/weston.man | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/man/weston.man b/man/weston.man index d8d924e4..86ed67be 100644 --- a/man/weston.man +++ b/man/weston.man @@ -255,6 +255,15 @@ This allows launching Weston as a nested server. For Wayland clients, holds the file descriptor of an open local socket to a Wayland server. .TP +.B WESTON_CONFIG_FILE +Weston sets this variable to the absolute path of the configuration file +it loads, or to the empty string if no file is used. Programs that use +.I weston.ini +will read the file specified by this variable instead, or do not read any +file if it is empty. Unset variable causes falling back to the default +name +.IR weston.ini . +.TP .B XCURSOR_PATH Set the list of paths to look for cursors in. It changes both libwayland-cursor and libXcursor, so it affects both Wayland and X11 based |