From c6f011606f64988a89ebb234b872212089bdb26e Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Fri, 10 Jul 2009 14:02:23 +0200 Subject: [PATCH] src/NetworkManager.c: fall back to default system config path if --config argument is omitted --- src/NetworkManager.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 6c2834f..8250eeb 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -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 @@ -336,6 +337,9 @@ main (int argc, char *argv[]) g_warning ("Config file %s invalid: %s.", config, error->message); exit (1); } + } else { + if (!parse_config_file (NM_DEFAULT_SYSTEM_CONF_FILE, &plugins, &error)) + g_warning ("Config file %s invalid: %s.", config, error->message); } pidfile = g_strdup (user_pidfile ? user_pidfile : NM_DEFAULT_PID_FILE); -- 1.6.3.3