[Pkg-utopia-commits] r2333 - in /packages/experimental/networkmanager/debian: changelog patches/10-execute_system_dhclient_script.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Jun 22 21:27:01 2008
New Revision: 2333

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2333
Log:
* debian/patches/10-execute_system_dhclient_script.patch
  - Added. Let NM's custom dhclient script execute the systems dhclient
  script.

Added:
    packages/experimental/networkmanager/debian/patches/10-execute_system_dhclient_script.patch
Modified:
    packages/experimental/networkmanager/debian/changelog
    packages/experimental/networkmanager/debian/patches/series

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=2333&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Sun Jun 22 21:27:01 2008
@@ -27,7 +27,12 @@
   * debian/*.install: Updated
   * debian/*.symbols: Updated
 
- -- Michael Biebl <biebl at debian.org>  Thu, 19 Jun 2008 00:11:17 +0200
+  [ Sjoerd Simons ]
+  * debian/patches/10-execute_system_dhclient_script.patch
+    - Added. Let NM's custom dhclient script execute the systems dhclient
+    script.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 22 Jun 2008 22:25:32 +0100
 
 network-manager (0.6.6-1) unstable; urgency=low
 

Added: packages/experimental/networkmanager/debian/patches/10-execute_system_dhclient_script.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/10-execute_system_dhclient_script.patch?rev=2333&op=file
==============================================================================
--- packages/experimental/networkmanager/debian/patches/10-execute_system_dhclient_script.patch (added)
+++ packages/experimental/networkmanager/debian/patches/10-execute_system_dhclient_script.patch Sun Jun 22 21:27:01 2008
@@ -1,0 +1,29 @@
+commit ab7e3a44e2869b91a62d12b3157fa1debc5df7a9
+Author: Sjoerd Simons <sjoerd.simons at 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)

Modified: packages/experimental/networkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/series?rev=2333&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/patches/series (original)
+++ packages/experimental/networkmanager/debian/patches/series Sun Jun 22 21:27:01 2008
@@ -1,2 +1,3 @@
 02-dbus_access_network_manager.patch
 05-debian_backend.patch
+10-execute_system_dhclient_script.patch