colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: add option to suppress error logging if nm_utils_modprobe() fails

Browse Source 
We don't want error logging for nm_platform_link_add() which
tries to load the bonding module. Later we will run tests as non-root,
where modprobe will fail. Logging an error would break the tests.
This commit is contained in:
Thomas Haller
2015-05-18 17:37:05 +02:00
parent 57958b93b6
commit 39f2b51abb
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/NetworkManagerUtils.c
View File

@@ -303,8 +303,19 @@ nm_spawn_process (const char *args, GError **error)
return status; return status;
} }
static const char *
_trunk_first_line (char *str)
{
char *s;
s = strchr (str, '\n');
if (s)
s[0] = '\0';
return str;
}
int int
nm_utils_modprobe (GError **error, const char *arg1, ...) nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *arg1, ...)
{ {
gs_unref_ptrarray GPtrArray *argv = NULL; gs_unref_ptrarray GPtrArray *argv = NULL;
int exit_status; int exit_status;
@@ -312,6 +323,8 @@ nm_utils_modprobe (GError **error, const char *arg1, ...)
#define ARGV_TO_STR(argv) (_log_str ? _log_str : (_log_str = g_strjoinv (" ", (char **) argv->pdata))) #define ARGV_TO_STR(argv) (_log_str ? _log_str : (_log_str = g_strjoinv (" ", (char **) argv->pdata)))
GError *local = NULL; GError *local = NULL;
va_list ap; va_list ap;
NMLogLevel llevel = suppress_error_logging ? LOGL_DEBUG : LOGL_ERR;
gs_free char *std_out = NULL, *std_err = NULL;
g_return_val_if_fail (!error || !*error, -1); g_return_val_if_fail (!error || !*error, -1);
g_return_val_if_fail (arg1, -1); g_return_val_if_fail (arg1, -1);
@@ -329,12 +342,14 @@ nm_utils_modprobe (GError **error, const char *arg1, ...)
g_ptr_array_add (argv, NULL); g_ptr_array_add (argv, NULL);
nm_log_dbg (LOGD_CORE, "modprobe: '%s'", ARGV_TO_STR (argv)); nm_log_dbg (LOGD_CORE, "modprobe: '%s'", ARGV_TO_STR (argv));
if (!g_spawn_sync (NULL, (char **) argv->pdata, NULL, 0, NULL, NULL, NULL, NULL, &exit_status, &local)) { if (!g_spawn_sync (NULL, (char **) argv->pdata, NULL, 0, NULL, NULL, &std_out, &std_err, &exit_status, &local)) {
nm_log_err (LOGD_CORE, "modprobe: '%s' failed: %s", ARGV_TO_STR (argv), local->message); nm_log (llevel, LOGD_CORE, "modprobe: '%s' failed: %s", ARGV_TO_STR (argv), local->message);
g_propagate_error (error, local); g_propagate_error (error, local);
return -1; return -1;
} else if (exit_status != 0) } else if (exit_status != 0)
nm_log_err (LOGD_CORE, "modprobe: '%s' exited with error %d", ARGV_TO_STR (argv), exit_status); nm_log (llevel, LOGD_CORE, "modprobe: '%s' exited with error %d%s%s%s%s%s%s", ARGV_TO_STR (argv), exit_status,
std_out&&*std_out ? " (" : "", std_out&&*std_out ? _trunk_first_line (std_out) : "", std_out&&*std_out ? ")" : "",
std_err&&*std_err ? " (" : "", std_err&&*std_err ? _trunk_first_line (std_err) : "", std_err&&*std_err ? ")" : "");
return exit_status; return exit_status;
} }

2
src/NetworkManagerUtils.h
View File

@@ -51,7 +51,7 @@ nm_utils_ip6_route_metric_normalize (guint32 metric)
int nm_spawn_process (const char *args, GError **error); int nm_spawn_process (const char *args, GError **error);
int nm_utils_modprobe (GError **error, const char *arg1, ...) G_GNUC_NULL_TERMINATED; int nm_utils_modprobe (GError **error, gboolean suppress_error_loggin, const char *arg1, ...) G_GNUC_NULL_TERMINATED;
/** /**
* str_if_set: * str_if_set:

2
src/devices/nm-device.c
View File

@@ -5294,7 +5294,7 @@ share_init (void)
} }
for (iter = modules; *iter; iter++) for (iter = modules; *iter; iter++)
nm_utils_modprobe (NULL, *iter, NULL); nm_utils_modprobe (NULL, FALSE, *iter, NULL);
return TRUE; return TRUE;
} }

2
src/platform/nm-linux-platform.c
View File

@@ -2439,7 +2439,7 @@ link_add (NMPlatform *platform,
* bond0 automatically. * bond0 automatically.
*/ */
if (!g_file_test ("/sys/class/net/bonding_masters", G_FILE_TEST_EXISTS)) if (!g_file_test ("/sys/class/net/bonding_masters", G_FILE_TEST_EXISTS))
nm_utils_modprobe (NULL, "bonding", "max_bonds=0", NULL); nm_utils_modprobe (NULL, TRUE, "bonding", "max_bonds=0", NULL);
} }
debug ("link: add link '%s' of type '%s' (%d)", debug ("link: add link '%s' of type '%s' (%d)",

2
src/ppp-manager/nm-ppp-manager.c
View File

@@ -1071,7 +1071,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
/* Make sure /dev/ppp exists (bgo #533064) */ /* Make sure /dev/ppp exists (bgo #533064) */
if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
nm_utils_modprobe (NULL, "ppp_generic", NULL); nm_utils_modprobe (NULL, FALSE, "ppp_generic", NULL);
connection = nm_act_request_get_connection (req); connection = nm_act_request_get_connection (req);
g_assert (connection); g_assert (connection);