fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 21:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fall back to old system-settings config file

Browse source
This commit is contained in:
Alexander Sack 2009-07-10 08:14:01 -04:00 • committed by Dan Williams
parent a736385127
commit 524ad83bc7
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/NetworkManager.c
View file

@ -55,6 +55,7 @@
#include "nm-logging.h"
#define NM_DEFAULT_PID_FILE LOCALSTATEDIR"/run/NetworkManager.pid"
#define NM_DEFAULT_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/nm-system-settings.conf"
/*
* Globals
@ -333,9 +334,22 @@ main (int argc, char *argv[])
/* Parse the config file */
if (config) {
if (!parse_config_file (config, &plugins, &error)) {
g_warning ("Config file %s invalid: %s.", config, error->message);
g_warning ("Config file %s invalid: (%d) %s.",
config,
error ? error->code : -1,
(error && error->message) ? error->message : "unknown");
exit (1);
}
} else {
config = NM_DEFAULT_SYSTEM_CONF_FILE;
if (!parse_config_file (config, &plugins, &error)) {
g_warning ("Default config file %s invalid: (%d) %s.",
config,
error ? error->code : -1,
(error && error->message) ? error->message : "unknown");
config = NULL;
/* Not a hard failure */
}
}
pidfile = g_strdup (user_pidfile ? user_pidfile : NM_DEFAULT_PID_FILE);