diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-23 13:25:15 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-23 13:25:15 -0700 |
| commit | 111ff834938463aad78326c1c30175e80b5b0600 (patch) | |
| tree | 651987d01ea70357e40ad7152f6be4240b475871 /src/dhcp-manager/nm-dhcp-dhcpcd.c | |
| parent | eedde7283fce2afceb8722cfb82544038fa3bbd4 (diff) | |
| download | NetworkManager-111ff834938463aad78326c1c30175e80b5b0600.tar.gz | |
dhcp: tell dhcpcd to send hostname to server too if requested
Diffstat (limited to 'src/dhcp-manager/nm-dhcp-dhcpcd.c')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-dhcpcd.c | 8 |
1 files changed, 7 insertions, 1 deletions
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); |