diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-09 11:49:25 +0100 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-01-19 12:07:27 -0600 |
| commit | 32625f604bbc45659f16d721e92fb6add9fb1502 (patch) | |
| tree | 0f844708bb9b6a1ce536cc1bb5ad226deb7ef867 | |
| parent | 4ad6099b016317563c14648ca6f04fb9e320d032 (diff) | |
| download | NetworkManager-32625f604bbc45659f16d721e92fb6add9fb1502.tar.gz | |
core: use nm_utils_modprobe()
https://bugzilla.gnome.org/show_bug.cgi?id=740651
| -rw-r--r-- | src/devices/nm-device.c | 17 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 4 | ||||
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 3 |
3 files changed, 4 insertions, 20 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 0ad774d29b..4c514b4a15 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4934,7 +4934,6 @@ nm_device_activate_schedule_ip6_config_timeout (NMDevice *self) static gboolean share_init (void) { - int status; char *modules[] = { "ip_tables", "iptable_nat", "nf_nat_ftp", "nf_nat_irc", "nf_nat_sip", "nf_nat_tftp", "nf_nat_pptp", "nf_nat_h323", NULL }; @@ -4954,20 +4953,8 @@ share_init (void) errsv, strerror (errsv)); } - for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; - char *envp[1] = { NULL }; - GError *error = NULL; - - if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, - NULL, NULL, NULL, NULL, &status, &error)) { - nm_log_err (LOGD_SHARING, "share: error loading NAT module %s: (%d) %s", - *iter, error ? error->code : 0, - (error && error->message) ? error->message : "unknown"); - if (error) - g_error_free (error); - } - } + for (iter = modules; *iter; iter++) + nm_utils_modprobe (NULL, *iter, NULL); return TRUE; } diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 9d306bf610..4ce792a1a0 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2267,7 +2267,6 @@ build_rtnl_link (int ifindex, const char *name, NMLinkType type) static gboolean link_add (NMPlatform *platform, const char *name, NMLinkType type, const void *address, size_t address_len) { - int r; struct nl_object *l; if (type == NM_LINK_TYPE_BOND) { @@ -2279,8 +2278,7 @@ link_add (NMPlatform *platform, const char *name, NMLinkType type, const void *a * bond0 automatically. */ if (!g_file_test ("/sys/class/net/bonding_masters", G_FILE_TEST_EXISTS)) - /* Ignore return value to shut up the compiler */ - r = system ("modprobe bonding max_bonds=0"); + nm_utils_modprobe (NULL, "bonding", "max_bonds=0", NULL); } debug ("link: add link '%s' of type '%s' (%d)", diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 5d22f52557..b2d5d6c2a2 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -1068,7 +1068,6 @@ nm_ppp_manager_start (NMPPPManager *manager, NMCmdLine *ppp_cmd; char *cmd_str; struct stat st; - int ignored; g_return_val_if_fail (NM_IS_PPP_MANAGER (manager), FALSE); g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE); @@ -1088,7 +1087,7 @@ nm_ppp_manager_start (NMPPPManager *manager, /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); + nm_utils_modprobe (NULL, "ppp_generic", NULL); connection = nm_act_request_get_connection (req); g_assert (connection); |