diff options
| author | Michael Biebl <biebl@debian.org> | 2008-08-22 20:15:21 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2008-08-22 20:15:21 +0000 |
| commit | dca9f3c2961cb9a32e26aa77e0cb08f4029e2404 (patch) | |
| tree | e03da82195bfe5444061d4e12b6e317f42c4ff3e /debian/patches/10-execute_system_dhclient_script.patch | |
| parent | 51377af1b0da7ebc9501e0486d2318c8f4c8ca45 (diff) | |
Remove 10-execute_system_dhclient_script.patch, patch no longer applies.
Resolvconf intergration will have to be addressedd differently. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2414 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, 0 insertions, 29 deletions
diff --git a/debian/patches/10-execute_system_dhclient_script.patch b/debian/patches/10-execute_system_dhclient_script.patch deleted file mode 100644 index bf040bf6..00000000 --- a/debian/patches/10-execute_system_dhclient_script.patch +++ /dev/null @@ -1,29 +0,0 @@ -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) |