Here's the patch.
It's really Robert Frank's patch. He told me where to put the code.
It's untested, and doesn't work in as a distro agnostic method as it
should.
On 8/20/07, Dan Williams <[EMAIL PROTECTED]> wrote:
> Does HAL show the devices in 'lshal'? Feel free to post the patch for
> dhclient.conf.
lshal does in fact show both devices. I may tinker with it later, but
i'm more likely going to live with borked dns until 0.7 comes out.
*fingers crossed for a Fedora 8 release*
-Yaakov
Index: src/dhcp-manager/nm-dhcp-manager.c
===================================================================
--- src/dhcp-manager/nm-dhcp-manager.c (revision 2712)
+++ src/dhcp-manager/nm-dhcp-manager.c (working copy)
@@ -45,10 +45,14 @@
#define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient"
#define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
+#define NM_DHCP_MANAGER_CONF_FILENAME "/etc/dhcp3/dhclient.conf"
+
#define ACTION_SCRIPT_PATH LIBEXECDIR "/nm-dhcp-client.action"
#define NM_DHCP_TIMEOUT 45 /* DHCP timeout, in seconds */
+
+
static const char *dhclient_binary_paths[] =
{
"/sbin/dhclient",
@@ -680,6 +684,10 @@
g_ptr_array_add (dhclient_argv, (gpointer) "-lf"); /* Set lease file */
g_ptr_array_add (dhclient_argv, (gpointer) leasefile);
+ g_ptr_array_add (dhclient_argv, (gpointer) "-cf"); /* Set config file */
+ g_ptr_array_add (dhclient_argv, (gpointer) NM_DHCP_MANAGER_CONF_FILENAME);
+
+
g_ptr_array_add (dhclient_argv, (gpointer) device->iface);
g_ptr_array_add (dhclient_argv, NULL);
@@ -785,6 +793,7 @@
if (!device->dhclient_pid)
return;
+
stop_dhclient (device->iface, device->dhclient_pid, blocking);
nm_info ("%s: canceled DHCP transaction, dhclient pid %d",
_______________________________________________
NetworkManager-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/networkmanager-list
