From a84f43c2e39184cfe24823889393e30487c5b2d3 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 22 Jun 2008 21:27:01 +0000 Subject: * debian/patches/10-execute_system_dhclient_script.patch - Added. Let NM's custom dhclient script execute the systems dhclient script. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2333 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- .../10-execute_system_dhclient_script.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 debian/patches/10-execute_system_dhclient_script.patch (limited to 'debian/patches/10-execute_system_dhclient_script.patch') diff --git a/debian/patches/10-execute_system_dhclient_script.patch b/debian/patches/10-execute_system_dhclient_script.patch new file mode 100644 index 00000000..bf040bf6 --- /dev/null +++ b/debian/patches/10-execute_system_dhclient_script.patch @@ -0,0 +1,29 @@ +commit ab7e3a44e2869b91a62d12b3157fa1debc5df7a9 +Author: Sjoerd Simons +Date: Sun Jun 22 22:23:38 2008 +0100 + + Execute system dhclient script + +diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c +index 9917235..30d7a02 100644 +--- a/callouts/nm-dhcp-client-action.c ++++ b/callouts/nm-dhcp-client-action.c +@@ -34,6 +34,9 @@ + #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" + #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" + ++ ++#define SYSTEM_DHCLIENT_SCRIPT "/sbin/dhclient-script" ++ + /** + * Start a dict in a dbus message. Should be paired with a call to + * {@link wpa_dbus_dict_close_write}. +@@ -295,6 +298,8 @@ main (int argc, char *argv[]) + + g_type_init (); + ++ g_spawn_command_line_sync (SYSTEM_DHCLIENT_SCRIPT, NULL, NULL, NULL, NULL); ++ + /* Get a connection to the system bus */ + connection = dbus_init (); + if (connection == NULL) -- cgit 1.3.0-6-gf8a5