summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Giudici <fgiudici@redhat.com>2017-09-11 14:50:06 +0200
committerThomas Haller <thaller@redhat.com>2017-09-11 15:14:37 +0200
commitb946aefe24a1d522a85c4d772439f4417d60455f (patch)
tree91a24c71535bb61ef2879218743ac4032365bc63
parent2b827fa8f2b0c50b98c613c14aefa06960fac41d (diff)
downloadNetworkManager-b946aefe24a1d522a85c4d772439f4417d60455f.tar.gz
dhcp: dhclient: fix daemon start when dhcp-timeout is specified
A typo in the new dhcp-timeout option caused the dhclient daemon to exit with error when the dhcp-timeout option was specified. This prevents dhcp connection to be upped. Fixes: 82ef497cc9e2728e73cb0426efbae85c83bec3fe (cherry picked from commit fa46736013fa1e3df1508b1f67b495ce45daf94a)
-rw-r--r--src/dhcp/nm-dhcp-dhclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index a56e5a3ceb..5a07d34766 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -453,7 +453,7 @@ dhclient_start (NMDhcpClient *client,
timeout = nm_dhcp_client_get_timeout (client);
if (timeout >= 60) {
timeout = timeout < G_MAXINT32 ? timeout + 1 : G_MAXINT32;
- g_ptr_array_add (argv, (gpointer) "-timeout");
+ g_ptr_array_add (argv, (gpointer) "--timeout");
g_ptr_array_add (argv, (gpointer) nm_sprintf_buf (timeout_str, "%u", (unsigned) timeout));
}