From 1b075023fab3283152b0d112d1497293912b30bd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 5 Nov 2008 17:18:13 +0000 Subject: [PATCH] 2008-11-05 Dan Williams * 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 --- ChangeLog | 6 ++++++ src/dhcp-manager/nm-dhcp-dhclient.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fe1cf85d27..0c55b7e3f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-05 Dan Williams + + * 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 * initscripts/Debian/NetworkManager diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 5ac263c439..f529315eda 100644 --- 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);