summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2008-12-06 00:12:06 +0000
committerMichael Biebl <biebl@debian.org>2008-12-06 00:12:06 +0000
commitd185a500e9559ec5d6b3aa02df089928a29f9f97 (patch)
tree54b7859f423f13ff5df137edcafaf781055ee9e4
parent3af857bd8faf37dc81955eb03026eb4f4a86bc95 (diff)
* debian/patches/05-dhclient_lease_files.patch
  - Change the location of the dhclient lease files to /var/lib/dhcp3.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2539 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/05-dhclient_lease_files.patch16
-rw-r--r--debian/patches/series1
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 14de33e4..1a1245c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low
       (Closes: #503682)
   * Update control, install and symbols file for the new libnm-util library
     name.
+  * debian/patches/05-dhclient_lease_files.patch
+    - Change the location of the dhclient lease files to /var/lib/dhcp3.
 
  -- Michael Biebl <biebl@debian.org>  Sat, 06 Dec 2008 00:43:22 +0100
 
diff --git a/debian/patches/05-dhclient_lease_files.patch b/debian/patches/05-dhclient_lease_files.patch
new file mode 100644
index 00000000..8f0597f3
--- /dev/null
+++ b/debian/patches/05-dhclient_lease_files.patch
@@ -0,0 +1,16 @@
+Index: network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c
+===================================================================
+--- network-manager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c	2008-12-06 01:09:52.000000000 +0100
++++ network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c	2008-12-06 01:10:29.000000000 +0100
+@@ -36,7 +36,11 @@
+ #define NM_DHCP_MANAGER_PID_FILENAME	"dhclient"
+ #define NM_DHCP_MANAGER_PID_FILE_EXT	"pid"
+ 
++#if defined (TARGET_DEBIAN)
++#define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhcp3"
++#else
+ #define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhclient"
++#endif
+ #define NM_DHCP_MANAGER_LEASE_FILENAME	"dhclient"
+ #define NM_DHCP_MANAGER_LEASE_FILE_EXT	"lease"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 13051060..682ac519 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02-dbus_access_network_manager.patch
 03-F3507g.patch -p0
 04-ltversioning.patch
+05-dhclient_lease_files.patch