summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-06-30 13:00:20 +0200
committerThomas Haller <thaller@redhat.com>2015-06-30 14:19:30 +0200
commit4fbd42a0355c1a2438edd869908b1616b328af6c (patch)
tree76788249be7c984d597d106549ad8a582b295ec0
parent7dc65df0209bfac263f801c5fbffd0037a7fc667 (diff)
downloadNetworkManager-4fbd42a0355c1a2438edd869908b1616b328af6c.tar.gz
dhcp: wait at most 2000 msec to kill existing dhcp process
-rw-r--r--src/dhcp-manager/nm-dhcp-client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index a59abdc3bb..aa5df9908a 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -604,7 +604,7 @@ nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name)
if (!strcmp (exe, binary_name))
nm_utils_kill_process_sync (tmp, start_time, SIGTERM, LOGD_DHCP,
- "dhcp-client", 1000 / 2, 1000 / 20, 0);
+ "dhcp-client", 1000 / 2, 1000 / 20, 2000);
}
}