From b7d21eba690186e310034a36355d350afd4af8d4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 23 Mar 2010 18:50:32 -0700 Subject: [PATCH] dhcp: print out DHCP client command strings --- src/dhcp-manager/nm-dhcp-dhclient.c | 6 +++++- src/dhcp-manager/nm-dhcp-dhcpcd.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 9ea31ef7aa..bf892bcfd7 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -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); diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 6895498a23..123ac06ab7 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -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);