proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 20:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Use a helper to get the sysconfig dir

Browse Source 
This makes testing using a prefix much easier.
This commit is contained in:
Richard Hughes 2017-06-05 09:10:17 +01:00
parent 0fe22ff010
commit 01c13d1634
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fu-main.c
View File

@ -293,6 +293,14 @@ fu_main_get_plugin_by_name (FuMainPrivate *priv, const gchar *name)
return NULL; return NULL;
} }
static const gchar *
fu_main_get_sysconfig_dir (void)
{
if (g_file_test (SYSCONFDIR, G_FILE_TEST_EXISTS))
return SYSCONFDIR;
return "/etc";
}
static gboolean static gboolean
fu_main_get_release_trust_flags (AsRelease *release, fu_main_get_release_trust_flags (AsRelease *release,
FwupdTrustFlags *trust_flags, FwupdTrustFlags *trust_flags,
@ -337,7 +345,7 @@ fu_main_get_release_trust_flags (AsRelease *release,
} }
/* check we were installed correctly */ /* check we were installed correctly */
pki_dir = g_build_filename (SYSCONFDIR, "pki", "fwupd", NULL); pki_dir = g_build_filename (fu_main_get_sysconfig_dir (), "pki", "fwupd", NULL);
if (!g_file_test (pki_dir, G_FILE_TEST_EXISTS)) { if (!g_file_test (pki_dir, G_FILE_TEST_EXISTS)) {
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
@ -2928,13 +2936,7 @@ main (int argc, char *argv[])
} }
/* read config file */ /* read config file */
config_file = g_build_filename (SYSCONFDIR, "fwupd.conf", NULL); config_file = g_build_filename (fu_main_get_sysconfig_dir (), "fwupd.conf", NULL);
if (!g_file_test (config_file, G_FILE_TEST_EXISTS)) {
g_warning ("FuMain: falling back to system config as %s missing",
config_file);
g_free (config_file);
config_file = g_build_filename ("/etc", "fwupd.conf", NULL);
}
g_debug ("loading config values from %s", config_file); g_debug ("loading config values from %s", config_file);
priv->config = g_key_file_new (); priv->config = g_key_file_new ();
if (!g_key_file_load_from_file (priv->config, config_file, if (!g_key_file_load_from_file (priv->config, config_file,