summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Globals.c
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2009-12-21 01:13:44 -0800
committerDan Nicholson <dbn.lists@gmail.com>2009-12-22 23:20:52 -0800
commit592b20c517461d32daf44a940386ffcc11c434f8 (patch)
treed20c89e68fe9fb9b7a55d013b327535c3dd2cebe /hw/xfree86/common/xf86Globals.c
parentefa5269f23c2237eb5368bf5245ffbbf35714153 (diff)
xfree86: Allow config directory to be specified on command line
Add a new command line parameter, -configdir, to specify the config directory to be used. Rules are the same as -config for root vs. user privileges. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Diffstat (limited to 'hw/xfree86/common/xf86Globals.c')
-rw-r--r--hw/xfree86/common/xf86Globals.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 98f828483..317b78a3a 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -143,6 +143,7 @@ xf86InfoRec xf86Info = {
#endif
};
const char *xf86ConfigFile = NULL;
+const char *xf86ConfigDir = NULL;
const char *xf86ModulePath = DEFAULT_MODULE_PATH;
MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGPREFIX;