diff options
| author | Sjoerd Simons <sjoerd@debian.org> | 2008-06-22 21:27:01 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@debian.org> | 2008-06-22 21:27:01 +0000 |
| commit | a84f43c2e39184cfe24823889393e30487c5b2d3 (patch) | |
| tree | bab3548fa75e6574231cbc06f4870338a1e844d7 /debian/patches/10-execute_system_dhclient_script.patch | |
| parent | 974a626ec1fdba2628546b0a7af56d363de5b2a3 (diff) | |
* 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
Diffstat (limited to 'debian/patches/10-execute_system_dhclient_script.patch')
| -rw-r--r-- | debian/patches/10-execute_system_dhclient_script.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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 <sjoerd.simons@collabora.co.uk> +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) |