summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-03-24 15:56:20 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-03-27 09:38:19 +0200
commit8a0e0ba66ace54062880d4bd9fbdd508ee9d3589 (patch)
tree51a860e9b65d7fe3a3fc794d436f79e60e0a3d48 /man
parent6c71aaeec5d034e052c9d95f3c36b5b38069f6d8 (diff)
downloadweston-8a0e0ba66ace54062880d4bd9fbdd508ee9d3589.tar.gz
compositor: add option to specify a weston.ini
Add a command line option to specify a file to be read instead of weston.ini. IVI-shell testing will at least temporarily need to specify a config file, because it cannot run without. That is why this is being added, but should be convenient for everybody, too. 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.man12
1 files changed, 12 insertions, 0 deletions
diff --git a/man/weston.man b/man/weston.man
index 86ed67be..c5dc2f20 100644
--- a/man/weston.man
+++ b/man/weston.man
@@ -111,6 +111,18 @@ or you can pass an absolute path. The default backend is
unless the environment suggests otherwise, see
.IR DISPLAY " and " WAYLAND_DISPLAY .
.TP
+\fB\-\^c\fR\fIconfig.ini\fR, \fB\-\-config\fR=\fIconfig.ini\fR
+Load
+.IR config.ini " instead of " weston.ini .
+The argument can also be an absolute path starting with a
+.IR / .
+If the path is not absolute, it will be searched in the normal config
+paths, see
+.BR weston.ini (5).
+If also
+.B --no-config
+is given, no configuration file will be read.
+.TP
.BR \-\-version
Print the program version.
.TP