Commit 8e34bf36 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Roth
Browse files

qga: add QGA_CONF environment variable 



Having a environment variable allows to override default configuration
path, useful for testing. Note that this can't easily be an argument,
since loading config is done before parsing the arguments.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent f3a06403

qga/main.c

+2 −1
Original line number Diff line number Diff line
@@ -945,10 +945,11 @@ static void config_load(GAConfig *config) 
{

    GError *gerr = NULL;

    GKeyFile *keyfile;

    const char *conf = g_getenv("QGA_CONF") ?: QGA_CONF_DEFAULT;



    /* read system config */

    keyfile = g_key_file_new();

    if (!g_key_file_load_from_file(keyfile, QGA_CONF_DEFAULT, 0, &gerr)) {

    if (!g_key_file_load_from_file(keyfile, conf, 0, &gerr)) {

        goto end;

    }

    if (g_key_file_has_key(keyfile, "general", "daemon", NULL)) {