dhcp: print out DHCP client command strings

This commit is contained in:
Dan Williams 2010-03-23 18:50:32 -07:00
parent c471bb4a03
commit b7d21eba69
2 changed files with 10 additions and 2 deletions

View file

@ -484,7 +484,7 @@ dhclient_start (NMDHCPClient *client,
GPid pid = 0;
GError *error = NULL;
const char *iface, *uuid;
char *binary_name;
char *binary_name, *cmd_str;
gboolean ipv6;
g_return_val_if_fail (priv->pid_file == NULL, -1);
@ -545,6 +545,10 @@ dhclient_start (NMDHCPClient *client,
g_ptr_array_add (argv, (gpointer) iface);
g_ptr_array_add (argv, NULL);
cmd_str = g_strjoinv (" ", (gchar **) argv->pdata);
nm_info ("running: %s", cmd_str);
g_free (cmd_str);
if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
&dhclient_child_setup, NULL, &pid, &error)) {
nm_warning ("dhclient failed to start. error: '%s'", error->message);

View file

@ -93,7 +93,7 @@ real_ip4_start (NMDHCPClient *client,
GPtrArray *argv = NULL;
GPid pid = 0;
GError *error = NULL;
char *pid_contents = NULL, *binary_name;
char *pid_contents = NULL, *binary_name, *cmd_str;
const char *iface, *uuid, *hostname;
g_return_val_if_fail (priv->pid_file == NULL, -1);
@ -138,6 +138,10 @@ real_ip4_start (NMDHCPClient *client,
g_ptr_array_add (argv, (gpointer) iface);
g_ptr_array_add (argv, NULL);
cmd_str = g_strjoinv (" ", (gchar **) argv->pdata);
nm_info ("running: %s", cmd_str);
g_free (cmd_str);
if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
&dhcpcd_child_setup, NULL, &pid, &error)) {
nm_warning ("dhcpcd failed to start. error: '%s'", error->message);