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

utils: add nm_utils_modprobe()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=740651
This commit is contained in:
Thomas Haller
2015-01-09 11:25:06 +01:00
committed by Dan Williams
parent 1970f59b6f
commit 4ad6099b01
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/NetworkManagerUtils.c
View File

@@ -48,6 +48,7 @@
#include "nm-setting-wireless-security.h" #include "nm-setting-wireless-security.h"
#include "nm-auth-utils.h" #include "nm-auth-utils.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
#include "gsystem-local-alloc.h"
/* /*
* Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
@@ -175,6 +176,42 @@ nm_spawn_process (const char *args)
return status; return status;
} }
int
nm_utils_modprobe (GError **error, const char *arg1, ...)
{
gs_unref_ptrarray GPtrArray *argv = NULL;
int exit_status;
gs_free char *_log_str = NULL;
#define ARGV_TO_STR(argv) (_log_str ? _log_str : (_log_str = g_strjoinv (" ", (char **) argv->pdata)))
GError *local = NULL;
va_list ap;
g_return_val_if_fail (!error || !*error, -1);
g_return_val_if_fail (arg1, -1);
/* construct the argument list */
argv = g_ptr_array_sized_new (4);
g_ptr_array_add (argv, "/sbin/modprobe");
g_ptr_array_add (argv, (char *) arg1);
va_start (ap, arg1);
while ((arg1 = va_arg (ap, const char *)))
g_ptr_array_add (argv, (char *) arg1);
va_end (ap);
g_ptr_array_add (argv, NULL);
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)) {
nm_log_err (LOGD_CORE, "modprobe: '%s' failed: %s", ARGV_TO_STR (argv), local->message);
g_propagate_error (error, local);
return -1;
} else if (exit_status != 0)
nm_log_err (LOGD_CORE, "modprobe: '%s' exited with error %d", ARGV_TO_STR (argv), exit_status);
return exit_status;
}
/** /**
* nm_utils_get_start_time_for_pid: * nm_utils_get_start_time_for_pid:
* @pid: the process identifier * @pid: the process identifier

2
src/NetworkManagerUtils.h
View File

@@ -51,6 +51,8 @@ nm_utils_ip6_route_metric_normalize (guint32 metric)
int nm_spawn_process (const char *args); int nm_spawn_process (const char *args);
int nm_utils_modprobe (GError **error, const char *arg1, ...) G_GNUC_NULL_TERMINATED;
/* check if @flags has exactly one flag (@check) set. You should call this /* check if @flags has exactly one flag (@check) set. You should call this
* only with @check being a compile time constant and a power of two. */ * only with @check being a compile time constant and a power of two. */
#define NM_FLAGS_HAS(flags, check) \ #define NM_FLAGS_HAS(flags, check) \