From 5ddab8fa8954ebc1c06902640a3cbf4be47a750b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 27 Jul 2008 19:15:20 +0000 Subject: [PATCH] 2008-07-27 Dan Williams Patch from Roy Marples * src/dhcp-manager/nm-dhcp-dhcpcd.c - (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3856 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/dhcp-manager/nm-dhcp-dhcpcd.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0fea024a32..4f3a3c762c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-27 Dan Williams + + Patch from Roy Marples + + * src/dhcp-manager/nm-dhcp-dhcpcd.c + - (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC + 2008-07-27 Dan Williams * src/nm-gsm-device.c diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 9978c9f2f2..ef4a33abb8 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -90,7 +90,9 @@ nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) argv = g_ptr_array_new (); g_ptr_array_add (argv, (gpointer) DHCP_CLIENT_PATH); - g_ptr_array_add (argv, (gpointer) "-X"); /* Don't fork */ + g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */ + + g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */ g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */