From 111ff834938463aad78326c1c30175e80b5b0600 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 23 Mar 2010 13:25:15 -0700 Subject: [PATCH] dhcp: tell dhcpcd to send hostname to server too if requested --- src/dhcp-manager/nm-dhcp-dhcpcd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 27fb31bcc4..1e014e70b5 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -70,7 +70,7 @@ real_ip4_start (NMDHCPClient *client, GPid pid = 0; GError *error = NULL; char *pid_contents = NULL, *binary_name; - const char *iface, *uuid; + const char *iface, *uuid, *hostname; g_return_val_if_fail (priv->pid_file == NULL, -1); @@ -105,6 +105,12 @@ real_ip4_start (NMDHCPClient *client, g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); + hostname = nm_setting_ip4_config_get_dhcp_hostname (s_ip4); + if (hostname && strlen (hostname)) { + g_ptr_array_add (argv, (gpointer) "-h"); /* Send hostname to DHCP server */ + g_ptr_array_add (argv, (gpointer) hostname ); + } + g_ptr_array_add (argv, (gpointer) iface); g_ptr_array_add (argv, NULL);