colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Dan Williams
2008-11-05 17:18:13 +00:00
parent a3bce59091
commit 1b075023fa
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -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> 2008-11-05 Michael Biebl <mbiebl@gmail.com>
* initscripts/Debian/NetworkManager * initscripts/Debian/NetworkManager

3
src/dhcp-manager/nm-dhcp-dhclient.c
View File

@@ -36,6 +36,7 @@
#define NM_DHCP_MANAGER_PID_FILENAME "dhclient" #define NM_DHCP_MANAGER_PID_FILENAME "dhclient"
#define NM_DHCP_MANAGER_PID_FILE_EXT "pid" #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_FILENAME "dhclient"
#define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease" #define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease"
@@ -57,7 +58,7 @@ static char *
get_leasefile_for_iface (const char * iface) get_leasefile_for_iface (const char * iface)
{ {
return g_strdup_printf ("%s/%s-%s.%s", return g_strdup_printf ("%s/%s-%s.%s",
NM_DHCP_MANAGER_RUN_DIR, NM_DHCP_MANAGER_LEASE_DIR,
NM_DHCP_MANAGER_LEASE_FILENAME, NM_DHCP_MANAGER_LEASE_FILENAME,
iface, iface,
NM_DHCP_MANAGER_LEASE_FILE_EXT); NM_DHCP_MANAGER_LEASE_FILE_EXT);