2008-11-05 Dan Williams <dcbw@redhat.com>

	* src/dhcp-manager/nm-dhcp-dhclient.c
		- (get_leasefile_for_iface): move lease files back to where dhclient
			puts them

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4267 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index fe1cf85..0c55b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-05  Dan Williams  <dcbw@redhat.com>
+
+       * src/dhcp-manager/nm-dhcp-dhclient.c
+               - (get_leasefile_for_iface): move lease files back to where dhclient
+                       puts them
+
 2008-11-05  Michael Biebl  <mbiebl@gmail.com>
 
        * initscripts/Debian/NetworkManager

diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 5ac263c..f529315 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -36,6 +36,7 @@
 #define NM_DHCP_MANAGER_PID_FILENAME   "dhclient"
 #define NM_DHCP_MANAGER_PID_FILE_EXT   "pid"
 
+#define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhclient"
 #define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient"
 #define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
 
@@ -57,7 +58,7 @@ static char *
 get_leasefile_for_iface (const char * iface)
 {
        return g_strdup_printf ("%s/%s-%s.%s",
-                               NM_DHCP_MANAGER_RUN_DIR,
+                               NM_DHCP_MANAGER_LEASE_DIR,
                                NM_DHCP_MANAGER_LEASE_FILENAME,
                                iface,
                                NM_DHCP_MANAGER_LEASE_FILE_EXT);