summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-05-12 21:34:16 -0400
committerMatthias Clasen <mclasen@redhat.com>2012-05-12 21:34:16 -0400
commit38d6ca074fb46c92e324bc0a7f53110fd96cc86f (patch)
tree7d04eaed1e4080a11dfa422664325a422337fc7e
parent9bd331d9a58ae023dbf77eb50b126253302eebd5 (diff)
downloadgdm-38d6ca074fb46c92e324bc0a7f53110fd96cc86f.tar.gz
initial-setup: Read overrides from the right location
-rw-r--r--gui/initial-setup/gdm-initial-setup.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index 3b40557f..1850a6f5 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -2205,6 +2205,7 @@ int
main (int argc, char *argv[])
{
SetupData *setup;
+ gchar *filename;
GError *error;
GOptionEntry entries[] = {
{ "skip-account", 0, 0, G_OPTION_ARG_NONE, &skip_account, "Skip account creation", NULL },
@@ -2238,15 +2239,15 @@ main (int argc, char *argv[])
}
setup->overrides = g_key_file_new ();
- if (!g_key_file_load_from_file (setup->overrides,
- "overrides.ini",
- 0, &error)) {
+ filename = g_build_filename (UIDIR, "overrides.ini", NULL);
+ if (!g_key_file_load_from_file (setup->overrides, filename, 0, &error)) {
if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
g_error ("%s", error->message);
exit (1);
}
g_error_free (error);
}
+ g_free (filename);
prepare_assistant (setup);