NetworkManager r4267 - in trunk: . src/dhcp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Wed Nov  5 17:18:13 2008
New Revision: 4267
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4267&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/src/dhcp-manager/nm-dhcp-dhclient.c

Modified: trunk/src/dhcp-manager/nm-dhcp-dhclient.c
==============================================================================
--- trunk/src/dhcp-manager/nm-dhcp-dhclient.c	(original)
+++ trunk/src/dhcp-manager/nm-dhcp-dhclient.c	Wed Nov  5 17:18:13 2008
@@ -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 @@
 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);